Merge 0.7->trunk (with MUC needing checking, waqas)
authorMatthew Wild <mwild1@gmail.com>
Tue, 4 May 2010 22:36:50 +0000 (23:36 +0100)
committerMatthew Wild <mwild1@gmail.com>
Tue, 4 May 2010 22:36:50 +0000 (23:36 +0100)
commit41c381fdf48a37137934bc3d6f44b024beb00df1
treef77f1673a20e30d53488924ed31f2e8d286a78f1
parent1304dbc73cb92e6d9c6df7890ca37220c00d43d5
parent721586aa7b25dc9e9ff0f045c329e226aeba7ba8
Merge 0.7->trunk (with MUC needing checking, waqas)
prosody