pidgin: 1794c067: merge of '148e99c7c4a60cc18826232bd8b327...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 1794c0679af33373ae3713099d5880e0eea1adfd
Parent:   148e99c7c4a60cc18826232bd8b3270cbdddc7b5
Parent:   89847795e1c9cbdd51c942ae1e506e6060ac2235
Author:   datallah at pidgin.im
Date:     11/08/10 17:51:35
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1794c0679af33373ae3713099d5880e0eea1adfd

Changelog: 

merge of '148e99c7c4a60cc18826232bd8b3270cbdddc7b5'
     and '89847795e1c9cbdd51c942ae1e506e6060ac2235'

Changes against parent 148e99c7c4a60cc18826232bd8b3270cbdddc7b5

  patched  ChangeLog
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/rxhandlers.c

Changes against parent 89847795e1c9cbdd51c942ae1e506e6060ac2235

  patched  pidgin/win32/untar.c