adium.1-4: ad5842c1: merge of '252fb792f5cf9ce9a9221900d13524...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: ad5842c18a1df74e7cc6849fcdf945eed83a8cd2
Parent:   252fb792f5cf9ce9a9221900d135242c6e91a629
Parent:   cfb61ee9a0d8f94d138e7a8b7c8455d3e0a4583b
Author:   evands at pidgin.im
Date:     09/19/10 17:41:41
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/ad5842c18a1df74e7cc6849fcdf945eed83a8cd2

Changelog: 

merge of '252fb792f5cf9ce9a9221900d135242c6e91a629'
     and 'cfb61ee9a0d8f94d138e7a8b7c8455d3e0a4583b'

Changes against parent 252fb792f5cf9ce9a9221900d135242c6e91a629

  patched  libpurple/protocols/yahoo/libymsg.c

Changes against parent cfb61ee9a0d8f94d138e7a8b7c8455d3e0a4583b

  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/yahoo/libyahoo.c
  patched  libpurple/protocols/yahoo/libyahoojp.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/util.c
  patched  libpurple/util.c