Software / code / prosody
Diff
DEPENDS @ 6156:6b1aee6536e8
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Apr 2014 01:02:20 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |
/ code / prosody | author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 27 Apr 2014 01:02:20 +0200 |
| parent | 5406:9903a03b7b3e |
| child | 8454:90962ef41bf3 |