pidgin.2.x.y: b9c74c3f: merge of '0b7caf6b17815fe333d151369f2633...

Tue Oct 4 14:40:46 EDT 2011

----------------------------------------------------------------------
Revision: b9c74c3f836a7a1a64710fc8244c9ec1f3f21b97
Parent:   0b7caf6b17815fe333d151369f26330d4c662bda
Parent:   efec3dc757b27366c8b23ca5c0bf1d8605084798
Author:   elb at pidgin.im
Date:     10/04/11 14:34:45
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/b9c74c3f836a7a1a64710fc8244c9ec1f3f21b97

Changelog: 

merge of '0b7caf6b17815fe333d151369f26330d4c662bda'
     and 'efec3dc757b27366c8b23ca5c0bf1d8605084798'

Changes against parent 0b7caf6b17815fe333d151369f26330d4c662bda

  patched  ChangeLog

Changes against parent efec3dc757b27366c8b23ca5c0bf1d8605084798

  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/sametime/sametime.c