Mercurial > prosody-hg
diff plugins/muc/lock.lib.lua @ 6442:0f4025abbe8f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 01:56:22 +0200 |
| parents | 6b3eb1611587 |
| children | e465b584547b |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 01:56:22 +0200 |
| parents | 6b3eb1611587 |
| children | e465b584547b |