merge of '03c404eccb061e74f2d68151ebe4e70b421691ab' cpw.qulogic.gtk3

Fri, 23 Dec 2011 08:22:03 +0000

author
Elliott Sales de Andrade <qulogic@pidgin.im>
date
Fri, 23 Dec 2011 08:22:03 +0000
branch
cpw.qulogic.gtk3
changeset 32925
d4d8afc054dc
parent 32924
03c404eccb06 (current diff)
parent 32438
dc8991868906 (diff)
child 32926
6a06b6cea862

merge of '03c404eccb061e74f2d68151ebe4e70b421691ab'
and 'dc8991868906a7f46665f194d41b996d7d4c385f'

mercurial