Merge commit 'refs/top-bases/t/extra-actions/log-consolidate' into t/extra-actions...
commite8590466dc2cb902c8fed61bd684c0dfc25f15fb
authorPetr Baudis <pasky@ucw.cz>
Mon, 25 May 2009 00:20:08 +0000 (25 02:20 +0200)
committerPetr Baudis <pasky@machine.or.cz>
Mon, 25 May 2009 00:20:08 +0000 (25 02:20 +0200)
tree4abc8e246d3741d69ec831a4e0a7265b00cad91b
parent057125f39759b4df2e9af0871c7de11543e51b5c
parent590e56d2279429532b989f972aa05fd9ae37979a
Merge commit 'refs/top-bases/t/extra-actions/log-consolidate' into t/extra-actions/log-consolidate

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