Mercurial > pidgin
diff AUTHORS @ 32113:4b53d875529f
fixed conflicts in previous merge.
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | 89f7e9924204 |
children | 542b75da206e |
author | tdrhq@soc.pidgin.im |
---|---|
date | Wed, 26 Aug 2009 03:19:30 +0000 |
parents | 89f7e9924204 |
children | 542b75da206e |