Software / code / prosody
Diff
util/ip.lua @ 7516:f74ff35a4b03
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parent | 7486:c415a3fd4485 |
| child | 8382:e5d00bf4a4d5 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 23 Jul 2016 18:58:58 +0200 |
| parent | 7486:c415a3fd4485 |
| child | 8382:e5d00bf4a4d5 |