im.pidgin.pidgin: 6546cfd72ecd9aa76fc524aaf3ac48489aeb2a90

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 6546cfd72ecd9aa76fc524aaf3ac48489aeb2a90
Ancestor: e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e
Ancestor: ed1ac2fd1572c0126f1f2890053e45f55d21c48e
Author: nosnilmot at pidgin.im
Date: 2007-12-04T02:50:44
Branch: im.pidgin.pidgin

Modified files:
        finch/gntconv.c libpurple/connection.c libpurple/prpl.h
        pidgin/gtkblist.c pidgin/gtkconv.c

ChangeLog: 

merge of 'e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e'
     and 'ed1ac2fd1572c0126f1f2890053e45f55d21c48e'