merge of '99a593a0819b562d803d1f963476a7cd0d4db7f7'v2.7.6
commit58a70ec137a9aca1a15cb21dcfbd00555741cdcb
authorElliott Sales de Andrade <qulogic@pidgin.im>
Mon, 22 Nov 2010 03:04:17 +0000 (22 03:04 +0000)
committerElliott Sales de Andrade <qulogic@pidgin.im>
Mon, 22 Nov 2010 03:04:17 +0000 (22 03:04 +0000)
treefff7ae1f6b7b995bcc02b029c25cb3e80263dacc
parent3ca98a582c519dca06144335bc213af5172013b0
parent6c0a984edde888cd2d6e435baff92cfbbcac5556
Merge ... '99a593a0819b562d803d1f963476a7cd0d4db7f7'
     and 'f352f10d5755679039efdc7a5d3235afc9e142e2'

--HG--
extra : convert_revision : f3e5e3ff81060137ebde7cf6d19ee15f5b8822b1