Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Fri, 13 Dec 2013 12:52:39 +0000 (12:52 +0000)
committerMatthew Wild <mwild1@gmail.com>
Fri, 13 Dec 2013 12:52:39 +0000 (12:52 +0000)
commit04bc83bc4d2668a95b4538def5b51cf8611ae111
tree48182449401aa032aae2d6e0973b3d9131099209
parentc4f6b842896fc8cacc10ac7b762bcab422b3f524
parent1b01b4fe53c7e81fc6911a63031713166f0917bf
Merge 0.9->0.10
plugins/muc/mod_muc.lua
prosody