pidgin: cc1a562f: merge of '0de8339ed2206f013cb9b8105fe3c7...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: cc1a562fa8dde234b47c4af65bfd665c3a63f642
Ancestor: 0de8339ed2206f013cb9b8105fe3c73ccc2a0f72
Ancestor: 74ffbb29d8b34ca9471c654d63e54325825d13e2
Author: markdoliner at pidgin.im
Date: 2009-06-29T06:50:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cc1a562fa8dde234b47c4af65bfd665c3a63f642

Modified files:
        ChangeLog libpurple/dnssrv.c libpurple/dnssrv.h po/ca.po

ChangeLog: 

merge of '0de8339ed2206f013cb9b8105fe3c73ccc2a0f72'
     and '74ffbb29d8b34ca9471c654d63e54325825d13e2'