Software / code / prosody
Diff
DEPENDS @ 5897:296e32a1ff33
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 31 Oct 2013 20:49:03 +0100 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |