pidgin: 3031bead: merge of '974d79cf8eb22b7138c9a3d7313e89...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 3031bead50a8d359f718d5d9accd75d5e79fac7d
Parent:   974d79cf8eb22b7138c9a3d7313e89585fd8b443
Parent:   a657534f694305a613db4946ca8ea9ab4c8f1c1d
Author:   evands at pidgin.im
Date:     02/21/11 17:56:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3031bead50a8d359f718d5d9accd75d5e79fac7d

Changelog: 

merge of '974d79cf8eb22b7138c9a3d7313e89585fd8b443'
     and 'a657534f694305a613db4946ca8ea9ab4c8f1c1d'

Changes against parent 974d79cf8eb22b7138c9a3d7313e89585fd8b443

  patched  ChangeLog
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/oscar.c

Changes against parent a657534f694305a613db4946ca8ea9ab4c8f1c1d

  patched  libpurple/conversation.h