merge of 'c238e0966eb1dd2753de002c9a3ab84c322e325e'

Fri, 23 Feb 2007 17:20:33 +0000

author
Evan Schoenberg <evands@pidgin.im>
date
Fri, 23 Feb 2007 17:20:33 +0000
changeset 15751
0212d6f8dc4b
parent 15750
c238e0966eb1 (current diff)
parent 15747
d13a561c934e (diff)
child 15752
ddbc89eeb603

merge of 'c238e0966eb1dd2753de002c9a3ab84c322e325e'
and 'd13a561c934e6dbf83fffa9784a9b24bfe8ea9b2'

mercurial