diff AUTHORS @ 30916:1aa5e2934ef0

merge of 'c7f2cce48dfe465889b7803de44156e7e89e41e0' and 'fafe54ad99f452f7b5d446e154440057c8863bd6'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 03 Sep 2010 07:28:41 +0000
parents 542b75da206e
children c4d512212ae2
line wrap: on
line diff