Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Thu, 28 Aug 2014 08:23:24 +0000 (09:23 +0100)
committerMatthew Wild <mwild1@gmail.com>
Thu, 28 Aug 2014 08:23:24 +0000 (09:23 +0100)
commit9c2f0d411179d87e9444bef51171df05128ec07d
tree23b6764a6f4605ff58c2f7f16348e57647518396
parent4d5e0ec0f1d3a858638288a07ffceec613727e84
parentd7ca046b0b3d597b1a78516cd283d338ecb3cbc1
Merge 0.9->0.10
core/modulemanager.lua
net/http/server.lua
plugins/mod_c2s.lua
plugins/mod_compression.lua
plugins/mod_posix.lua
plugins/mod_s2s/mod_s2s.lua
prosodyctl
util/filters.lua
util/prosodyctl.lua
util/xmppstream.lua