pidgin: a6563c73: merge of '6447eb03b5b0d21ec2d313005e95d6...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: a6563c73412a7ef0a1425ce5882741e7ada6e3e9
Ancestor: 6447eb03b5b0d21ec2d313005e95d66b4376eeae
Ancestor: e4372ae7e8d466825e2baad0ab63a4293bc258de
Author: maiku at pidgin.im
Date: 2009-09-23T10:02:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a6563c73412a7ef0a1425ce5882741e7ada6e3e9

Modified files:
        libpurple/connection.c libpurple/dbus-server.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/server.c libpurple/util.c
        pidgin/plugins/win32/winprefs/winprefs.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '6447eb03b5b0d21ec2d313005e95d66b4376eeae'
     and 'e4372ae7e8d466825e2baad0ab63a4293bc258de'