Merge 0.9 -> 0.10
authorKim Alvefur <zash@zash.se>
Wed, 12 Feb 2014 18:26:22 +0000 (19:26 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 12 Feb 2014 18:26:22 +0000 (19:26 +0100)
commitcd4302a2db387ed852a06cb997e6424d61ca5419
tree4374d28a19d42f1c6f0c8cf51896f49ed5386263
parenta68136f591f00c08234bda7a9c53a369863ea8f3
parent978c02fed6dee6a32792b135cc5971d9834fd453
Merge 0.9 -> 0.10
plugins/mod_admin_telnet.lua
plugins/mod_s2s/s2sout.lib.lua