pidgin: 18f16a42: merge of '51da76f83bc049dc92e4199b15f634...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 18f16a423f835272cdecfadd92ac25f7dfa9ce50
Ancestor: 51da76f83bc049dc92e4199b15f634d001a5fa02
Ancestor: 80e8cabf693147bcebc8857d383b6aab279d75ae
Author: darkrain42 at pidgin.im
Date: 2009-07-19T19:38:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18f16a423f835272cdecfadd92ac25f7dfa9ce50

Modified files:
        ChangeLog finch/gntmedia.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/switchboard.c libpurple/util.c
        pidgin/gtkblist.c po/de.po

ChangeLog: 

merge of '51da76f83bc049dc92e4199b15f634d001a5fa02'
     and '80e8cabf693147bcebc8857d383b6aab279d75ae'