Software / code / prosody
Diff
DEPENDS @ 7038:22f36a3d6369
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 01 Jan 2016 23:31:13 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 01 Jan 2016 23:31:13 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |