pidgin: 75ea2678: merge of '487397995e13465f3b2c9d4748f832...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 75ea267822832fccf8671b593d79999e32b6c694
Ancestor: 487397995e13465f3b2c9d4748f832eaa17b2f9f
Ancestor: 7cd7197fa3237ff97089c9ca567c7d87b9457769
Author: sadrul at pidgin.im
Date: 2008-05-23T16:46:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/75ea267822832fccf8671b593d79999e32b6c694

Modified files:
        ChangeLog doc/pidgin.1.in libpurple/network.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/buddy.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/purple-remote libpurple/purple-url-handler
        pidgin/gtkaccount.c pidgin/gtkplugin.c pidgin/gtkpounce.c
        pidgin/gtkprefs.c pidgin/gtksound.c po/de.po

ChangeLog: 

merge of '487397995e13465f3b2c9d4748f832eaa17b2f9f'
     and '7cd7197fa3237ff97089c9ca567c7d87b9457769'