Revision 971434016f53b709560eb9d60ba6c7d93309c24a

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 971434016f53b709560eb9d60ba6c7d93309c24a
Ancestor: 0688801ca4ae33291c9078b8181e01f85ef7a4a1
Ancestor: 96c17aa92f27f926d9d4c366b3c2c308f8251424
Author: rlaager at pidgin.im
Date: 2007-04-28T05:38:15
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c pidgin/pidginstock.c

ChangeLog: 

merge of '0688801ca4ae33291c9078b8181e01f85ef7a4a1'
     and '96c17aa92f27f926d9d4c366b3c2c308f8251424'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 971434016f53b709560eb9d60ba6c7d93309c24a