merge of '033cfe5bb467b25b241e1d6593fa3cdd5d3e3b97'

Mon, 10 Sep 2007 23:13:42 +0000

author
Etan Reisner <deryni@pidgin.im>
date
Mon, 10 Sep 2007 23:13:42 +0000
changeset 19925
3acb9a4cc486
parent 19918
033cfe5bb467 (current diff)
parent 19924
a2e6ae72790e (diff)
child 19926
fd8c090b8516
child 20599
635128be5569

merge of '033cfe5bb467b25b241e1d6593fa3cdd5d3e3b97'
and 'a2e6ae72790e5e1317533dce0d5eb3ab104c36d2'

mercurial