pidgin: f86a595f: merge of '499902f7613784436d3ab1e47339e2...

Wed May 11 00:44:17 EDT 2011

----------------------------------------------------------------------
Revision: f86a595f2d4c5405d8c5cf65eee0e2db0836c723
Parent:   499902f7613784436d3ab1e47339e2822f695102
Parent:   991beede956f49a172400a1cc3b5784f94a00fba
Author:   darkrain42 at pidgin.im
Date:     05/11/11 00:35:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f86a595f2d4c5405d8c5cf65eee0e2db0836c723

Changelog: 

merge of '499902f7613784436d3ab1e47339e2822f695102'
     and '991beede956f49a172400a1cc3b5784f94a00fba'

Changes against parent 499902f7613784436d3ab1e47339e2822f695102

  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/silc/chat.c

Changes against parent 991beede956f49a172400a1cc3b5784f94a00fba

  patched  libpurple/protocols/gg/gg.c