Software / code / prosody
Diff
DEPENDS @ 2985:fde53d82fde0
Merge 0.7->trunk (with MUC needing checking, waqas)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 04 May 2010 23:36:50 +0100 |
| parent | 447:c0dae734d3bf |
| child | 4914:2e9b16b2ae00 |
