Merge branch 'next' into refs/top-bases/pu
commitb3a6f9712670da92055b23521d23f1a2f2eee0cc
authorPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 11:11:41 +0000 (2 13:11 +0200)
committerPetr Baudis <pasky@suse.cz>
Thu, 2 Oct 2008 11:11:41 +0000 (2 13:11 +0200)
tree82ce24ac40c4da5eb24d139aa1fbb7ad515d3b64
parentc7850d305ee6bfda9b1b64d8c62cec0d484269dd
parent1f5c7ac7ec6cc95e0940fefb047cc55a7e7e22b2
Merge branch 'next' into refs/top-bases/pu

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