Mercurial > prosody-hg
diff net/dns.lua @ 7510:8a0a50e8ef2d
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 21 Jul 2016 12:24:18 +0100 |
| parents | 4c519444d4a2 |
| children | 936b78e9f399 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 21 Jul 2016 12:24:18 +0100 |
| parents | 4c519444d4a2 |
| children | 936b78e9f399 |