Software / code / prosody
Diff
DEPENDS @ 5082:1ffc788c5696
Merge 0.9->trunk (who has been pushing to trunk?)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 05 Aug 2012 17:21:19 +0100 |
| parent | 4914:2e9b16b2ae00 |
| child | 5406:9903a03b7b3e |
