pidgin: 2c478c4a: merge of '8a2ad25fe0712bc0d47a1229671868...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 2c478c4a5297ed4f4ceca9e3fa210d6e4d27622d
Parent:   8a2ad25fe0712bc0d47a1229671868560599a2cd
Parent:   9da15614ca2aaddf25bfffea7e99eca752dd86b3
Author:   datallah at pidgin.im
Date:     05/03/11 08:49:56
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2c478c4a5297ed4f4ceca9e3fa210d6e4d27622d

Changelog: 

merge of '8a2ad25fe0712bc0d47a1229671868560599a2cd'
     and '9da15614ca2aaddf25bfffea7e99eca752dd86b3'

Changes against parent 8a2ad25fe0712bc0d47a1229671868560599a2cd

  patched  ChangeLog
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h

Changes against parent 9da15614ca2aaddf25bfffea7e99eca752dd86b3

  patched  COPYRIGHT
  patched  ChangeLog
  patched  finch/gntnotify.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h