pidgin: 13eb34d9: merge of '649c72408dd9527b22c5e15aced51c...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 13eb34d9635427b4ad50a26d68cefe600903e4da
Parent:   649c72408dd9527b22c5e15aced51c15e325d4bb
Parent:   c64a4a6aaa74f97f9aa696b4f7756d93a9a243b8
Author:   datallah at pidgin.im
Date:     04/18/11 20:20:36
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/13eb34d9635427b4ad50a26d68cefe600903e4da

Changelog: 

merge of '649c72408dd9527b22c5e15aced51c15e325d4bb'
     and 'c64a4a6aaa74f97f9aa696b4f7756d93a9a243b8'

Changes against parent 649c72408dd9527b22c5e15aced51c15e325d4bb

  patched  libpurple/dnsquery.c

Changes against parent c64a4a6aaa74f97f9aa696b4f7756d93a9a243b8

  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/signals.c
  patched  libpurple/signals.h
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c