Mercurial > prosody-hg
diff net/dns.lua @ 5166:72cdc2d4e15e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | c25dee24623f |
| children | 5c3a3ef6b769 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Oct 2012 20:15:39 +0100 |
| parents | c25dee24623f |
| children | 5c3a3ef6b769 |