Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 5 Oct 2014 13:37:21 +0000 (15:37 +0200)
commitf07f727a9af9c34196d21b1e3c9dcbba31796bba
treecdc6df78f0b9a8a391ff893fec94045268c527ca
parent91fbe5534aa5b666d35545980105cdf28ec299bb
parent4b39eb72b97e9827e5322974f0424c3fc063ce25
Merge 0.9->0.10
net/dns.lua
plugins/mod_admin_adhoc.lua