Software / code / prosody
Diff
DEPENDS @ 6428:3ee09bfe16e1
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 23 Sep 2014 23:22:13 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |