Merge 0.10->trunk
authorMatthew Wild <mwild1@gmail.com>
Tue, 17 Nov 2015 17:12:45 +0000 (17:12 +0000)
committerMatthew Wild <mwild1@gmail.com>
Tue, 17 Nov 2015 17:12:45 +0000 (17:12 +0000)
commita80158e16b2d2a83d79148f9aeca7921877492e9
tree6ded3b0e86750bd45e2ff72327b7a0ff1c68976b
parent979e1e44aced6150462a31e99e245aea5f81c42a
parent0979336ed04a158da127710b0cf574c885556668
Merge 0.10->trunk
plugins/muc/muc.lib.lua