Software / code / prosody
Diff
DEPENDS @ 8060:71bdfdf6565d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 04 Apr 2017 01:41:09 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |