Merge branch 'pu' into refs/top-bases/girocco
commit3a1623bd1a9f7f9fcb940cf874c6a21ee3242647
authorPetr Baudis <pasky@ucw.cz>
Tue, 3 Nov 2009 22:44:49 +0000 (3 23:44 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Tue, 3 Nov 2009 22:44:49 +0000 (3 23:44 +0100)
tree3d60259abda7de8ccd317542c24badcefa4b60b3
parent372a63f259a202f312100b5eb480c2823fdcaa04
parentfc42156b19fe6a9274a8795687cd6c8e164f4d81
Merge branch 'pu' into refs/top-bases/girocco

Conflicts:

gitweb/gitweb.css
gitweb/README
gitweb/gitweb.css
gitweb/gitweb.perl