comparison AUTHORS @ 31217:23b7b1b817c8

merge of '5af6a35c4c39341b79cc8d61c700da2b874b9b6b' and 'b4a877b5d355860851acfe7ac186ba5d4f88d684'
author masca@cpw.pidgin.im
date Sun, 06 Jun 2010 21:27:12 +0000
parents 542b75da206e
children c4d512212ae2
comparison
equal deleted inserted replaced
31216:acc66653b4ff 31217:23b7b1b817c8