Diff

AUTHORS @ 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 792:57c793b1575f
child 5403:d7ecf6cd584e
line wrap: on
line diff