Mercurial > prosody-hg
diff plugins/muc/muc.lib.lua @ 5681:43cc1f95395e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 13 Jun 2013 12:07:46 +0100 |
| parents | 4fd2708fe8df 24b044f6e06d |
| children | bd0ff8ae98a8 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 13 Jun 2013 12:07:46 +0100 |
| parents | 4fd2708fe8df 24b044f6e06d |
| children | bd0ff8ae98a8 |