Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Tue, 6 Aug 2013 12:35:03 +0000 (14:35 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 6 Aug 2013 12:35:03 +0000 (14:35 +0200)
commitad8eb26bb81e69acf30e47c80a0f0d8963dc4fde
treeb17f56e3e4ff61ba42a8bf5c55023cbe03cd1540
parentb0dab0d704fd4aec57dc89e3b10f8bb061ceb57c
parentb69af96e5c9124a4c05cda679fd1ef15aaa19fd2
Merge 0.9->trunk
plugins/mod_admin_telnet.lua
plugins/mod_s2s/mod_s2s.lua