Software / code / prosody
Diff
DEPENDS @ 6039:f8df0a996575
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 25 Mar 2014 19:18:32 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 25 Mar 2014 19:18:32 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |