Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 19 Sep 2015 15:51:20 +0000 (17:51 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 19 Sep 2015 15:51:20 +0000 (17:51 +0200)
commitdb6acd5d9321d3b6ad1132bd04d87190684065e0
tree10ecaa11d66bd883537ff7f7f862c51ab01a9201
parent6b11d360150a77befb15ae549a2477cf11a85c29
parentc4b175b2365080dbeebefcbbd5ef02016909d337
Merge 0.10->trunk
plugins/mod_admin_telnet.lua