Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 25 Apr 2015 22:06:44 +0000 (00:06 +0200)
commit0ee742019c5a7a86de6fbaf98db2c737c5ce41a9
treecab8d9cfdf06afe45f83d8ddc8e6cd4cd34cc9b1
parentf437ae2c0cf8bdaf57ce21ebc906f5e05fb8c2b3
parentde20dc80b581d0f58bb6f3fa5c2b7beb0f10aac7
Merge 0.9->0.10
net/dns.lua
plugins/mod_s2s/s2sout.lib.lua