pidgin: 5221a4e1: merge of '414e6fd248a6ee80f1bc52c4c4fe5b...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 5221a4e174e2811d23fdb02fdb26465208915ff1
Ancestor: 414e6fd248a6ee80f1bc52c4c4fe5b24f6375f88
Ancestor: ce7325225416ec95baeeda78efa250ccc0c8dc87
Author: qulogic at pidgin.im
Date: 2009-01-20T03:15:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5221a4e174e2811d23fdb02fdb26465208915ff1

Modified files:
        ChangeLog libpurple/blist.c

ChangeLog: 

merge of '414e6fd248a6ee80f1bc52c4c4fe5b24f6375f88'
     and 'ce7325225416ec95baeeda78efa250ccc0c8dc87'