pidgin.2.x.y: 8c802f21: merge of '081986627877141e126dc3bcd9b0ab...

Wed Feb 15 17:30:48 EST 2012

----------------------------------------------------------------------
Revision: 8c802f21862e2c83621e4fcba09a8635119970ad
Parent:   081986627877141e126dc3bcd9b0ab5063e96e83
Parent:   c1fcac5fd1367b69d817021a3b50df463b53de0b
Author:   darkrain42 at pidgin.im
Date:     02/15/12 17:27:43
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/8c802f21862e2c83621e4fcba09a8635119970ad

Changelog: 

merge of '081986627877141e126dc3bcd9b0ab5063e96e83'
     and 'c1fcac5fd1367b69d817021a3b50df463b53de0b'

Changes against parent 081986627877141e126dc3bcd9b0ab5063e96e83

  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/network.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/proxy.c
  patched  pidgin/gtkprefs.c

Changes against parent c1fcac5fd1367b69d817021a3b50df463b53de0b

  patched  pidgin/plugins/disco/gtkdisco.c