Software / code / prosody
Diff
COPYING @ 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 | 767:13ae298c67d7 |
| child | 4303:9f10476e1af4 |
