pidgin: 7386f651: merge of '8225619bc6916576c4c3ba198c023d...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 7386f651da12e8eaa3a280ff11f2d7c163136d94
Parent:   8225619bc6916576c4c3ba198c023dbba87d8f95
Parent:   cf60754e39ca2f5aa7f21f3f766366cd840e871c
Author:   rekkanoryo at pidgin.im
Date:     03/28/11 17:55:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7386f651da12e8eaa3a280ff11f2d7c163136d94

Changelog: 

merge of '8225619bc6916576c4c3ba198c023dbba87d8f95'
     and 'cf60754e39ca2f5aa7f21f3f766366cd840e871c'

Changes against parent 8225619bc6916576c4c3ba198c023dbba87d8f95

  patched  COPYRIGHT
  patched  ChangeLog

Changes against parent cf60754e39ca2f5aa7f21f3f766366cd840e871c

  patched  libpurple/dnssrv.c