merge of '832fa9f51123c7b70dd829b911d6abe1cab42b00'

Wed, 02 Jan 2008 22:15:06 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Wed, 02 Jan 2008 22:15:06 +0000
changeset 22103
f11f1570cd4d
parent 21987
832fa9f51123 (diff)
parent 22102
a267e3882b27 (current diff)
child 22104
56970903b8e9
child 22109
1a242fadcb38

merge of '832fa9f51123c7b70dd829b911d6abe1cab42b00'
and 'a267e3882b279aba93dd11cc583ac6f755c65842'

mercurial