soc.2010.detachablepurple: ed0bcf02: merge of '086707bc9ebd6a9c565a51174c85c7...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: ed0bcf02ba2c2d2f0f2e8955926fceedf7f54a19
Parent:   086707bc9ebd6a9c565a51174c85c7f7b43a7130
Parent:   81a9a444ed8ae8e9678d43ee3733e7ccd930bfb6
Author:   gillux at soc.pidgin.im
Date:     07/06/10 23:37:21
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/ed0bcf02ba2c2d2f0f2e8955926fceedf7f54a19

Changelog: 

merge of '086707bc9ebd6a9c565a51174c85c7f7b43a7130'
     and '81a9a444ed8ae8e9678d43ee3733e7ccd930bfb6'

Changes against parent 086707bc9ebd6a9c565a51174c85c7f7b43a7130

  patched  libpurple/blist-node.c
  patched  libpurple/blist-node.h
  patched  libpurple/blist.c
  patched  libpurple/buddy.c
  patched  libpurple/buddy.h
  patched  libpurple/contact.c
  patched  libpurple/ghash.c
  patched  libpurple/group.c
  patched  libpurple/group.h
  patched  libpurple/md5cipher.h
  patched  libpurple/pobject.c
  patched  libpurple/protocols/bonjour/buddy.c
  patched  libpurple/protocols/gg/buddylist.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/sync.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/sha256cipher.h

Changes against parent 81a9a444ed8ae8e9678d43ee3733e7ccd930bfb6

  patched  libpurple/account.c