merge of '4486a73a8624b7cec0d333d942fb5015527bb36d'

Tue, 19 Jan 2010 06:33:18 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Tue, 19 Jan 2010 06:33:18 +0000
changeset 29220
9b2e8aaa7421
parent 29219
4486a73a8624 (current diff)
parent 29213
29e5c8015a86 (diff)
child 29221
7f2b72fc521a