Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 9 Nov 2014 19:32:33 +0000 (20:32 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 9 Nov 2014 19:32:33 +0000 (20:32 +0100)
commit08cba26d87fc68ef70ccff6edaeccbd88539f7ed
tree634268b6eb85ecf5b593f18808c7ddaf05516858
parent7fac02237b6fdc0dad24fa63df3e1e8bdcce096d
parent72fb60fd799e0f75daa96534cb2583823e8c8f0b
Merge 0.10->trunk
plugins/mod_admin_telnet.lua