Merge git://repo.or.cz/git-browser/dscho
commit6bffdf2aa1a32e124e67d42a2629d90f26f236df
authorPetr Baudis <pasky@ucw.cz>
Tue, 3 Jun 2008 00:21:27 +0000 (3 02:21 +0200)
committerPetr Baudis <pasky@rover.dkm.cz>
Tue, 3 Jun 2008 00:21:27 +0000 (3 02:21 +0200)
tree4fb7ac1069c47209015e65c8e64450d106832412
parent33e2c053b9d9dc9e345af88d62ad7ec20456ce62
parent00182838ce75f691e20038d15c4935b130259023
Merge git://repo.or.cz/git-browser/dscho

Conflicts:

git-browser.cgi
by-commit.html
git-browser.cgi