pidgin: e39dfbe6: merge of '3cf23371e3e019d9e8de26e38bab17...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: e39dfbe6c3a61b035fc764dfaad7b49c84666d14
Ancestor: 3cf23371e3e019d9e8de26e38bab170c5ed4aca1
Ancestor: cee63f93d8c1fdcf74c596d5958b744aa0638042
Author: deryni at pidgin.im
Date: 2009-02-19T03:41:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e39dfbe6c3a61b035fc764dfaad7b49c84666d14

Modified files:
        finch/plugins/gntclipboard.c finch/plugins/gntgf.c
        finch/plugins/grouping.c finch/plugins/lastlog.c
        libpurple/plugin.h libpurple/plugins/autoaccept.c
        libpurple/plugins/codeinline.c libpurple/plugins/newline.c
        libpurple/plugins/offlinemsg.c libpurple/prefs.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/silc10/silc.c libpurple/sslconn.h
        libpurple/version.h.in pidgin/gtkblist.h
        pidgin/plugins/convcolors.c pidgin/plugins/markerline.c
        pidgin/plugins/pidgininc.c pidgin/plugins/timestamp.c
        po/de.po

ChangeLog: 

merge of '3cf23371e3e019d9e8de26e38bab170c5ed4aca1'
     and 'cee63f93d8c1fdcf74c596d5958b744aa0638042'