Merge 0.9->0.10
authorMatthew Wild <mwild1@gmail.com>
Fri, 25 Jul 2014 12:01:57 +0000 (13:01 +0100)
committerMatthew Wild <mwild1@gmail.com>
Fri, 25 Jul 2014 12:01:57 +0000 (13:01 +0100)
commit82edcefcb3e5613fc6e9088926863db36bd3955b
treefca1b1b13cd2d286b4da8ba87fd44d63fd47eb51
parentfe046de19b91f36fb7d53fa251c8e57b870c7281
parent2232c77752e44b858407f8ab5f09231cbb986698
Merge 0.9->0.10
net/dns.lua
plugins/mod_admin_telnet.lua