Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 22 Jan 2016 13:49:05 +0000 (14:49 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 22 Jan 2016 13:49:05 +0000 (14:49 +0100)
commit3649d951aa384ebe81c156c692438ff6fc318dff
tree8d0a0a788cb286071ade399d62ea678c6596e442
parent9a39a17dc60558bb0fb6590c1b35f135a32c642c
parentb33842507539ae3b2cc4e4da2bc61eae4a5fc3d1
Merge 0.9->0.10
net/dns.lua
net/server.lua
net/server_select.lua
plugins/mod_s2s/s2sout.lib.lua