pidgin: 92d2f852: merge of '2774f6446b6bd057a7012aad6408b8...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 92d2f85227948eba1c1b529cb12ddf864b23d34b
Parent:   2774f6446b6bd057a7012aad6408b8dea457fbf6
Parent:   369315b95ea96caa0f91acbabf434a6a0177f450
Author:   darkrain42 at pidgin.im
Date:     07/02/10 21:01:39
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/92d2f85227948eba1c1b529cb12ddf864b23d34b

Changelog: 

merge of '2774f6446b6bd057a7012aad6408b8dea457fbf6'
     and '369315b95ea96caa0f91acbabf434a6a0177f450'

Changes against parent 2774f6446b6bd057a7012aad6408b8dea457fbf6

  patched  libpurple/plugins/Makefile.mingw
  patched  pidgin/plugins/Makefile.mingw

Changes against parent 369315b95ea96caa0f91acbabf434a6a0177f450

  patched  pidgin/gtkimhtmltoolbar.c