Mercurial > prosody-hg
diff net/dns.lua @ 4290:aaa06e68a9e4
Merge 0.8->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:28:41 +0100 |
| parents | 29d7eb6ff62c |
| children | 9a20acf315c9 |
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 02 Jun 2011 15:28:41 +0100 |
| parents | 29d7eb6ff62c |
| children | 9a20acf315c9 |