pidgin.2.x.y: 02284171: merge of 'c8c73eea7431e6f940916315ace40a...

Fri Oct 21 10:45:47 EDT 2011

----------------------------------------------------------------------
Revision: 02284171de47bfc34efd7551e77e9d86849fb8ad
Parent:   c8c73eea7431e6f940916315ace40a41c8da3faa
Parent:   d6a48850118c6a7c8c5f0d05b89334bc2a53d3ef
Author:   elb at pidgin.im
Date:     10/21/11 10:38:35
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/02284171de47bfc34efd7551e77e9d86849fb8ad

Changelog: 

merge of 'c8c73eea7431e6f940916315ace40a41c8da3faa'
     and 'd6a48850118c6a7c8c5f0d05b89334bc2a53d3ef'

Changes against parent c8c73eea7431e6f940916315ace40a41c8da3faa

  patched  ChangeLog
  patched  Makefile.am
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/win32/posix.uname.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/yahoo/yahoo_picture.c
  patched  pidgin/gtkutils.c

Changes against parent d6a48850118c6a7c8c5f0d05b89334bc2a53d3ef

  patched  finch/libgnt/gntwm.c