Mercurial > pidgin
diff AUTHORS @ 29829:90dbc46a771f
Fixup merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 22 Mar 2010 22:26:14 +0000 |
parents | 542b75da206e |
children | c4d512212ae2 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 22 Mar 2010 22:26:14 +0000 |
parents | 542b75da206e |
children | c4d512212ae2 |