soc.2010.detachablepurple: 51034ef0: merge of 'ed0bcf02ba2c2d2f0f2e8955926fce...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 51034ef0d724cf07c5c1d6a054f2b5b9a285e791
Parent:   ed0bcf02ba2c2d2f0f2e8955926fceedf7f54a19
Parent:   f3416f0abea0d93e20fd2402175d3b4f2a75a8df
Author:   gillux at soc.pidgin.im
Date:     07/12/10 20:46:20
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/51034ef0d724cf07c5c1d6a054f2b5b9a285e791

Changelog: 

merge of 'ed0bcf02ba2c2d2f0f2e8955926fceedf7f54a19'
     and 'f3416f0abea0d93e20fd2402175d3b4f2a75a8df'

Changes against parent ed0bcf02ba2c2d2f0f2e8955926fceedf7f54a19

  patched  libpurple/account-dbus.c
  patched  libpurple/account-dbus.h
  patched  libpurple/account.c
  patched  libpurple/dbus-maybe.h
  patched  libpurple/dbus-prototypes/account.xml
  patched  libpurple/dbus-server.c
  patched  libpurple/dbus-server.h
  patched  libpurple/pobject.c
  patched  libpurple/pobject.h

Changes against parent f3416f0abea0d93e20fd2402175d3b4f2a75a8df

  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