pidgin: 123768d7: merge of '3031bead50a8d359f718d5d9accd75...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 123768d79f4f982bc33327525308486cd2eba51b
Parent:   3031bead50a8d359f718d5d9accd75d5e79fac7d
Parent:   82147786072b59a286d5a14abfcf7ff7c56fbb35
Author:   evands at pidgin.im
Date:     02/21/11 17:57:05
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/123768d79f4f982bc33327525308486cd2eba51b

Changelog: 

merge of '3031bead50a8d359f718d5d9accd75d5e79fac7d'
     and '82147786072b59a286d5a14abfcf7ff7c56fbb35'

Changes against parent 3031bead50a8d359f718d5d9accd75d5e79fac7d

  patched  libpurple/conversation.c

Changes against parent 82147786072b59a286d5a14abfcf7ff7c56fbb35

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