Mercurial > prosody-hg
diff net/dns.lua @ 7219:c12c9b9c1949
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Feb 2016 19:27:13 +0100 |
| parents | 5286e79c6829 |
| children | addf60d25356 |
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Feb 2016 19:27:13 +0100 |
| parents | 5286e79c6829 |
| children | addf60d25356 |