pidgin: a4290ec7: merge of '9e21ee2eab363a8afc2552ab67c23b...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: a4290ec72723df07b95a33743c09a15533b590fb
Parent:   9e21ee2eab363a8afc2552ab67c23b90a88d7553
Parent:   ab6bb200fc9274b04542f7161ebc2f03db5b1585
Author:   qulogic at pidgin.im
Date:     07/03/10 19:48:50
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a4290ec72723df07b95a33743c09a15533b590fb

Changelog: 

merge of '9e21ee2eab363a8afc2552ab67c23b90a88d7553'
     and 'ab6bb200fc9274b04542f7161ebc2f03db5b1585'

Changes against parent 9e21ee2eab363a8afc2552ab67c23b90a88d7553

  patched  ChangeLog
  patched  Makefile.am
  patched  configure.ac
  patched  libpurple/Makefile.am
  patched  libpurple/protocols/msn/slplink.c

Changes against parent ab6bb200fc9274b04542f7161ebc2f03db5b1585

  patched  ChangeLog.API
  patched  libpurple/plugins/Makefile.mingw
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/plugins/Makefile.mingw