pidgin: 86cc5a45: merge of '840e5251829610a4d5500832438e60...

Wed Apr 6 09:41:22 EDT 2011

----------------------------------------------------------------------
Revision: 86cc5a457dee4c2ec3959a16039fb3d445b511b7
Parent:   840e5251829610a4d5500832438e6086f442148c
Parent:   e357c34b0d64535b96825a863bbd90aec7a71880
Author:   darkrain42 at pidgin.im
Date:     04/06/11 09:36:26
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/86cc5a457dee4c2ec3959a16039fb3d445b511b7

Changelog: 

merge of '840e5251829610a4d5500832438e6086f442148c'
     and 'e357c34b0d64535b96825a863bbd90aec7a71880'

Changes against parent 840e5251829610a4d5500832438e6086f442148c

  patched  libpurple/protocols/jabber/si.c

Changes against parent e357c34b0d64535b96825a863bbd90aec7a71880

  patched  libpurple/protocols/irc/irc.c