Merge branch 't/email/obfuscate' into refs/top-bases/girocco
commitc0358457ee7d46e0622aa0b510ef86fef7e9eafe
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:45:27 +0000 (3 00:45 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:45:27 +0000 (3 00:45 +0100)
treeb7565cf9010dfa821db984f84ab2bb64f59a48e8
parent2f1b18e9d5a9d9efc5ddbef29c39b1ac83a0dc98
parentdcec92b8c8622b9d53d7ea861dc861d63cf1877b
Merge branch 't/email/obfuscate' into refs/top-bases/girocco