im.pidgin.pidgin: e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e
Ancestor: 8ae0d2f36bb2689e7de9fcb3245c1e9484bd3fe6
Ancestor: c93ff822e1d2ed0916468029ebfbbea0ed0f28fa
Author: sadrul at pidgin.im
Date: 2007-12-03T22:57:49
Branch: im.pidgin.pidgin

Modified files:
        configure.ac doc/finch.1.in finch/gntconv.c
        libpurple/blist.c libpurple/connection.c
        libpurple/protocols/oscar/family_feedbag.c libpurple/prpl.h
        pidgin/gtkblist.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '8ae0d2f36bb2689e7de9fcb3245c1e9484bd3fe6'
     and 'c93ff822e1d2ed0916468029ebfbbea0ed0f28fa'