merge of '2cc05a1ca3ef3410f0ff1b8a3ea7c7196bb0e9e8'

Thu, 15 May 2008 09:48:09 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Thu, 15 May 2008 09:48:09 +0000
changeset 23102
0cde4b0e8c73
parent 23101
2cc05a1ca3ef (current diff)
parent 22998
a611ae9d9706 (diff)
child 23103
a514d2b765b0

merge of '2cc05a1ca3ef3410f0ff1b8a3ea7c7196bb0e9e8'
and 'a611ae9d9706fa653c191235e4d42e9a67f611fb'