# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179561146 0
# Node ID 9fd39a035729a06d754e947850c2de741a9ac9f9
# Parent  b40f3d7da1fcdb1ca5df2f103d5c019a563096f3# Parent  c8ed8e35154130894f3107725e1efdb22522649f
explicit merge of '61827fc1671b97df72194ee9722ed122cb45c29f'
              and 'fd6c233ae7838b2c5e1e8a177019a21f91e4a923'
        to branch 'im.pidgin.pidgin'

diff -r b40f3d7da1fc -r 9fd39a035729 ChangeLog