pidgin: d9152f10: merge of '2cabccedebb0366f69f7d3e9c3e16e...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: d9152f1035ac663af38a0af967f66cf614804d6e
Parent:   2cabccedebb0366f69f7d3e9c3e16e2f4c6b3aae
Parent:   964dd46e688370c356b8c9f20a929290f4a00e6d
Author:   darkrain42 at pidgin.im
Date:     06/24/11 22:47:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d9152f1035ac663af38a0af967f66cf614804d6e

Changelog: 

merge of '2cabccedebb0366f69f7d3e9c3e16e2f4c6b3aae'
     and '964dd46e688370c356b8c9f20a929290f4a00e6d'

Changes against parent 2cabccedebb0366f69f7d3e9c3e16e2f4c6b3aae

  patched  libpurple/protocols/jabber/jabber.c

Changes against parent 964dd46e688370c356b8c9f20a929290f4a00e6d

  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h