Merge commit 'vanilla/master' into refs/top-bases/t/email/obfuscate
commitd6945d1a1dea419174fffb20934630c9d57dbc17
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:45:24 +0000 (3 00:45 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:45:24 +0000 (3 00:45 +0100)
treedc11cab537d3080d225ade1a75bcad1150104ebd
parent433d1647d5633744eca0dc07e6b5302574caa209
parent8cc62c1677c99c5e204d2b51269b47b7557a79e0
Merge commit 'vanilla/master' into refs/top-bases/t/email/obfuscate