# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179561019 0
# Node ID fb35886b0d855ffa593fb2c149b044dc970cae54
# Parent  3034129a10b64eeb92ac385fe8b354c6ce9875ba# Parent  7cdc1d7fad5586a507c39c3edd8c5e9e726134a7
explicit merge of '4398ffa92e9bb0a16dbede7756a4cbc5dfa96602'
              and '43627b3c181a468a8dfbf2ce457608f02a014a2b'
        to branch 'im.pidgin.pidgin'

diff -r 7cdc1d7fad55 -r fb35886b0d85 ChangeLog