Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:11:01 +0000 (13:11 +0200)
commite381f159ff44b9f8d89fe93d8cc525c4d839e9ef
tree942747191464ad5ee163ece0dbf6af0596f041e5
parent73609fc39f973d8b0fcbf3e7298fa6088320a8da
parent1f2cbde684461badbcc7566cba50a0374063b98f
Merge 0.9->0.10
net/adns.lua
net/dns.lua