Merge 0.7->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 22 Mar 2010 17:26:12 +0000 (17:26 +0000)
committerMatthew Wild <mwild1@gmail.com>
Mon, 22 Mar 2010 17:26:12 +0000 (17:26 +0000)
commit4643eae0bf41b461c9337bfb66f9ac80f7e84f11
tree9a36c6329eb70d4e655dc88742cea8419f06f9c3
parentbf0f40124c857757954d2ff41fc0b6284667cdcf
parent3813f633eebc075fc0cf3db4c7da4f24f49e5bc0
Merge 0.7->trunk
plugins/muc/muc.lib.lua
prosody
util/xmppstream.lua