pidgin: 091e51ec: merge of '1042c695d02b49cb9360bb4ef591c4...

Thu Feb 4 18:05:34 EST 2010

-----------------------------------------------------------------
Revision: 091e51ec52b6a8997b13d2bae08a177dcdc409d5
Ancestor: 1042c695d02b49cb9360bb4ef591c4ff3209c5e5
Ancestor: 46f6d47a97be4bbe0262771c328eda1419d62542
Author: markdoliner at pidgin.im
Date: 2010-02-04T23:03:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/091e51ec52b6a8997b13d2bae08a177dcdc409d5

Modified files:
        libpurple/buddyicon.c libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/myspace/myspace.c
        pidgin/gtkblist-theme-loader.c pidgin/gtkblist-theme.c
        pidgin/plugins/timestamp.c po/de.po

ChangeLog: 

merge of '1042c695d02b49cb9360bb4ef591c4ff3209c5e5'
     and '46f6d47a97be4bbe0262771c328eda1419d62542'