# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179561063 0
# Node ID c8ed8e35154130894f3107725e1efdb22522649f
# Parent  fb35886b0d855ffa593fb2c149b044dc970cae54# Parent  ec6a029c865de46ab041a7f97b6383640e35508f
explicit merge of '751c46819c7edfd139753ceda847258389eee965'
              and 'e39b5117f8df79ccfe2f383c3b0bbe8f33566991'
        to branch 'im.pidgin.pidgin'

diff -r ec6a029c865d -r c8ed8e351541 ChangeLog