pidgin: 185ffd57: merge of '56ec802a4201a596a1bf852cae8f08...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 185ffd5736a7237c891d3f9629e3c6ba20df0fc2
Parent:   56ec802a4201a596a1bf852cae8f08819ca6bedc
Parent:   f1442997e656d73d0aad5c9daf3de27983b7cc1b
Author:   markdoliner at pidgin.im
Date:     08/11/11 02:36:47
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/185ffd5736a7237c891d3f9629e3c6ba20df0fc2

Changelog: 

merge of '56ec802a4201a596a1bf852cae8f08819ca6bedc'
     and 'f1442997e656d73d0aad5c9daf3de27983b7cc1b'

Changes against parent 56ec802a4201a596a1bf852cae8f08819ca6bedc

  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/session.c

Changes against parent f1442997e656d73d0aad5c9daf3de27983b7cc1b

  patched  libpurple/protocols/sametime/sametime.c