pidgin: 52c86223: merge of '5a1200b2b4048e408dafc7a965a87d...

Sun Feb 20 21:20:47 EST 2011

----------------------------------------------------------------------
Revision: 52c86223b26c47f35f75e2e1dbb9d898de6c605f
Parent:   5a1200b2b4048e408dafc7a965a87d3429925cb4
Parent:   cba010d1c097d4e6599f08276ed9d894710c1074
Author:   darkrain42 at pidgin.im
Date:     02/20/11 21:14:54
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/52c86223b26c47f35f75e2e1dbb9d898de6c605f

Changelog: 

merge of '5a1200b2b4048e408dafc7a965a87d3429925cb4'
     and 'cba010d1c097d4e6599f08276ed9d894710c1074'

Changes against parent 5a1200b2b4048e408dafc7a965a87d3429925cb4

  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c

Changes against parent cba010d1c097d4e6599f08276ed9d894710c1074

  patched  libpurple/protocols/jabber/jabber.c