Merge 0.6->0.7
authorMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:11 +0000 (23:09 +0100)
committerMatthew Wild <mwild1@gmail.com>
Sat, 3 Apr 2010 22:09:11 +0000 (23:09 +0100)
commit425f13a269dfb7f7458baaea17fd254caea45b45
tree4a25f96f1f3399025eccd92e1d87e3cd49726b44
parentf22e235217e21484315f8e735722f0a3cbc6fb4d
parent392b51f575c1771ab9a9f88e4b1b487fb8c43660
Merge 0.6->0.7
plugins/mod_bosh.lua
plugins/muc/muc.lib.lua
prosody