Merge branch 't/email/obfuscate' into refs/top-bases/girocco
commit9de3b90bd6ac44d0fbeec472228c5edcd8dee7ac
authorPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:38:04 +0000 (12 16:38 +0200)
committerPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:38:04 +0000 (12 16:38 +0200)
treea24364e0e718afd6fc0b77a41e51c70add19faaa
parent0245e90999d9029c7adc1459654c9c29d11ebae1
parent97e64f4aaa494c17af9bbda5de7e3b826591bd8c
Merge branch 't/email/obfuscate' into refs/top-bases/girocco

Conflicts:
gitweb/gitweb.perl
gitweb/gitweb.perl