merge of 'be2a6f2437b4f8a829435024437a9c939080f11b'

Sat, 10 May 2008 05:21:21 +0000

author
Kevin Stange <kstange@pidgin.im>
date
Sat, 10 May 2008 05:21:21 +0000
changeset 23046
ee4dfa45f5fc
parent 23045
be2a6f2437b4 (current diff)
parent 23044
3abb7dc817aa (diff)
child 23047
f2c25bf1e0fd

merge of 'be2a6f2437b4f8a829435024437a9c939080f11b'
and '3abb7dc817aa2a1993599b289419cff258b08881'

Binary file pidgin/pixmaps/logo.png has changed

mercurial