comparison 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
comparison
equal deleted inserted replaced
32112:1ca2df744414 32113:4b53d875529f