Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Sat, 18 Jan 2014 18:46:12 +0000 (18:46 +0000)
committerMatthew Wild <mwild1@gmail.com>
Sat, 18 Jan 2014 18:46:12 +0000 (18:46 +0000)
commite03af6cfcad563f764793d966e1320e18436bb77
tree9d6ec79eced140ec1539e3d5785f2332bfd00619
parent448a0e37d69b4a2757e374dd4da1f1e5e678fc21
parent13364cc23cfd0d1a2870ffe5d3e7d5a777b324be
Merge 0.9->0.10
plugins/mod_tls.lua
tools/ejabberd2prosody.lua
tools/ejabberdsql2prosody.lua