pidgin: 731a3b68: merge of 'bfb17183fbbf44cc19720d4d11594a...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 731a3b6828aec0e7b6d1fd9b6db1b1ff6ac35b85
Ancestor: bfb17183fbbf44cc19720d4d11594a7fdaad25de
Ancestor: f525448585711b2790cb6158b85897a15b546241
Author: darkrain42 at pidgin.im
Date: 2009-06-22T16:39:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/731a3b6828aec0e7b6d1fd9b6db1b1ff6ac35b85

Modified files:
        ChangeLog libpurple/protocols/myspace/markup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        pidgin/plugins/disco/Makefile.mingw

ChangeLog: 

merge of 'bfb17183fbbf44cc19720d4d11594a7fdaad25de'
     and 'f525448585711b2790cb6158b85897a15b546241'