Software / code / prosody
Diff
util/ip.lua @ 6070:c0654505357e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 16:52:03 +0200 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6926:d96b2aa7a11d |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 10 Apr 2014 16:52:03 +0200 |
| parent | 5776:bd0ff8ae98a8 |
| child | 6926:d96b2aa7a11d |