diff AUTHORS @ 29917:af5a46ecfb24

merge of '52fb5cb4cd8795906a7313dd5edde763a4848a3e' and '884d44222e8c81ecec51c25e07d005e002a5479b'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 12 May 2010 05:15:44 +0000
parents 542b75da206e
children c4d512212ae2
line wrap: on
line diff