pidgin: b84653f1: merge of '68f895b33b8b9c0317cb580b90d3df...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: b84653f183486a9171a8900c372a9e8545d3b03b
Parent:   68f895b33b8b9c0317cb580b90d3df28b85065b6
Parent:   bb8b5af65aed1351167474bd132cff898ef21f24
Author:   evands at pidgin.im
Date:     02/21/11 17:57:27
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b84653f183486a9171a8900c372a9e8545d3b03b

Changelog: 

merge of '68f895b33b8b9c0317cb580b90d3df28b85065b6'
     and 'bb8b5af65aed1351167474bd132cff898ef21f24'

Changes against parent 68f895b33b8b9c0317cb580b90d3df28b85065b6

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

Changes against parent bb8b5af65aed1351167474bd132cff898ef21f24

  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c