pidgin: 391f156c: merge of '6b600951723c4797bafdc840f751b7...

Fri Mar 7 13:56:06 EST 2008

-----------------------------------------------------------------
Revision: 391f156c789bf56c8523a54108569cf9c272f045
Ancestor: 6b600951723c4797bafdc840f751b75c3f0f95af
Ancestor: d5c0cb15bed84a2a8662c85cf02f430e9d82272d
Author: markdoliner at pidgin.im
Date: 2008-03-07T18:52:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/391f156c789bf56c8523a54108569cf9c272f045

Modified files:
        ChangeLog finch/gntsound.c finch/libgnt/gntentry.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h pidgin/gtkconv.c po/de.po

ChangeLog: 

merge of '6b600951723c4797bafdc840f751b75c3f0f95af'
     and 'd5c0cb15bed84a2a8662c85cf02f430e9d82272d'