Revision e1ea870d04aac126230cd2dad76d813069d437d3

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e1ea870d04aac126230cd2dad76d813069d437d3
Ancestor: 423a721fddd927f3df88692418420a12e6ff3e14
Ancestor: a3b182f786583648c5772f15ceff81af594efef0
Author: sadrul at pidgin.im
Date: 2007-05-05T22:31:32
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog libpurple/dnssrv.c libpurple/internal.h
        pidgin/gtkmain.c pidgin/gtksound.c

ChangeLog: 

merge of '423a721fddd927f3df88692418420a12e6ff3e14'
     and 'a3b182f786583648c5772f15ceff81af594efef0'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from e1ea870d04aac126230cd2dad76d813069d437d3