Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Wed, 2 Apr 2014 16:41:38 +0000 (17:41 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 2 Apr 2014 16:41:38 +0000 (17:41 +0100)
commita87ec53e152b80f64351b3f9dc4db8974d2e8f8a
treed5c6c17f4fea069ff5211c1ab0fd409de81dd110
parentbf5030942e1e307ad7aa9f4c393b6eb3d8b5fbed
parent093ca38d015fa8edfd6a78cff019bd62941e0050
Merge 0.9->0.10
core/portmanager.lua
net/server_event.lua
net/server_select.lua
plugins/mod_compression.lua
plugins/muc/muc.lib.lua
util/dependencies.lua
util/xmppstream.lua