pidgin: 84e4c207: merge of '25bd5b382cc84daef94ed59dab062f...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 84e4c2078413eedc9eaea26df534ecca59425b69
Parent:   25bd5b382cc84daef94ed59dab062fea9d1613f9
Parent:   2679e81d33ef8b6f8087c9d7aa5f4e563a32f3d1
Author:   qulogic at pidgin.im
Date:     02/14/11 20:49:11
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/84e4c2078413eedc9eaea26df534ecca59425b69

Changelog: 

merge of '25bd5b382cc84daef94ed59dab062fea9d1613f9'
     and '2679e81d33ef8b6f8087c9d7aa5f4e563a32f3d1'

Changes against parent 25bd5b382cc84daef94ed59dab062fea9d1613f9

  added    libpurple/tests/test_oscar_util.c
  patched  libpurple/account.h
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  pidgin/gtkconv.c

Changes against parent 2679e81d33ef8b6f8087c9d7aa5f4e563a32f3d1

  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/user.h