soc.2010.detachablepurple: 81a9a444: merge of 'c3f4e616fbee99afae6dd37f4563b2...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 81a9a444ed8ae8e9678d43ee3733e7ccd930bfb6
Parent:   c3f4e616fbee99afae6dd37f4563b29ef560fdbc
Parent:   cc85c8630fb11a6ef6a68a6ae653c5647af1ae1e
Author:   gillux at soc.pidgin.im
Date:     07/06/10 23:24:57
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/81a9a444ed8ae8e9678d43ee3733e7ccd930bfb6

Changelog: 

merge of 'c3f4e616fbee99afae6dd37f4563b29ef560fdbc'
     and 'cc85c8630fb11a6ef6a68a6ae653c5647af1ae1e'

Changes against parent c3f4e616fbee99afae6dd37f4563b29ef560fdbc

  patched  libpurple/pobject.c
  patched  libpurple/pobject.h

Changes against parent cc85c8630fb11a6ef6a68a6ae653c5647af1ae1e

  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