pidgin: 89847795: merge of '69fbc32fd3dfe8ca0979e1c486c3d5...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: 89847795e1c9cbdd51c942ae1e506e6060ac2235
Parent:   69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf
Parent:   a3c4035630c492aaae37ec8ddb8943c2f465e166
Author:   darkrain42 at pidgin.im
Date:     11/08/10 12:05:53
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/89847795e1c9cbdd51c942ae1e506e6060ac2235

Changelog: 

merge of '69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf'
     and 'a3c4035630c492aaae37ec8ddb8943c2f465e166'

Changes against parent 69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf

  patched  ChangeLog
  patched  libpurple/protocols/jabber/google/google_session.c

Changes against parent a3c4035630c492aaae37ec8ddb8943c2f465e166

  patched  libpurple/account.c
  patched  libpurple/protocols/jabber/adhoccommands.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/encoding.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi