pidgin: 350958bf: merge of '225e515a43307f04c7c0570ba58778...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 350958bfea237f95cef600e16d6e10e0d059fe2d
Ancestor: 225e515a43307f04c7c0570ba5877858a0f71209
Ancestor: 558f5ed16016e9ba8c7b5ccc6da9afb53de7ce3d
Author: darkrain42 at pidgin.im
Date: 2009-06-22T02:53:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/350958bfea237f95cef600e16d6e10e0d059fe2d

Added files:
        pidgin/plugins/disco/Makefile.mingw
Modified files:
        ChangeLog.API ChangeLog.win32 NEWS
        pidgin/plugins/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '225e515a43307f04c7c0570ba5877858a0f71209'
     and '558f5ed16016e9ba8c7b5ccc6da9afb53de7ce3d'