pidgin: ed86fcf2: merge of '0abffcad910fa64b1fd467e340482c...

Fri Mar 12 05:25:51 EST 2010

-----------------------------------------------------------------
Revision: ed86fcf2affb16773ec06c5308346a2e54c9ea3e
Ancestor: 0abffcad910fa64b1fd467e340482c2afda5da94
Ancestor: 4c6e9260bad001a21cebccbd649aaa52539c08fd
Author: markdoliner at pidgin.im
Date: 2010-03-12T10:22:13
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ed86fcf2affb16773ec06c5308346a2e54c9ea3e

Modified files:
        ChangeLog.win32 Makefile.mingw
        libpurple/protocols/jabber/libxmpp.c pidgin/gtkdialogs.c
        pidgin/win32/nsis/generate_gtk_zip.sh

ChangeLog: 

merge of '0abffcad910fa64b1fd467e340482c2afda5da94'
     and '4c6e9260bad001a21cebccbd649aaa52539c08fd'