pidgin: 41b01400: merge of '4f105e3377f4f4857b76c46669e414...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 41b0140041e7b5f52558997cf4225340e2f07971
Parent:   4f105e3377f4f4857b76c46669e414e45bdde0d1
Parent:   b84653f183486a9171a8900c372a9e8545d3b03b
Author:   evands at pidgin.im
Date:     02/21/11 17:57:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/41b0140041e7b5f52558997cf4225340e2f07971

Changelog: 

merge of '4f105e3377f4f4857b76c46669e414e45bdde0d1'
     and 'b84653f183486a9171a8900c372a9e8545d3b03b'

Changes against parent 4f105e3377f4f4857b76c46669e414e45bdde0d1

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

Changes against parent b84653f183486a9171a8900c372a9e8545d3b03b

  patched  libpurple/conversation.c
  patched  libpurple/conversation.h