pidgin: bb8b5af6: merge of '123768d79f4f982bc3332752530848...

Mon Feb 21 18:11:13 EST 2011

----------------------------------------------------------------------
Revision: bb8b5af65aed1351167474bd132cff898ef21f24
Parent:   123768d79f4f982bc33327525308486cd2eba51b
Parent:   acfa965755213c9701cf8f2d13189c9ac42e538a
Author:   evands at pidgin.im
Date:     02/21/11 17:57:18
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bb8b5af65aed1351167474bd132cff898ef21f24

Changelog: 

merge of '123768d79f4f982bc33327525308486cd2eba51b'
     and 'acfa965755213c9701cf8f2d13189c9ac42e538a'

Changes against parent 123768d79f4f982bc33327525308486cd2eba51b

  patched  libpurple/protocols/irc/parse.c

Changes against parent acfa965755213c9701cf8f2d13189c9ac42e538a

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