Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 06:21:27 +0000 (23:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 06:21:27 +0000 (23:21 -0700)
commitb43688a5bc2eaa8a5805856fc11dc3cd60e6e6ac
tree32c76821afb58cb0e69b667f9cd1947895492807
parent1f0eb51391d58958dd9f1e6cbcba622c309303b2
parent70649945c215b1674611a40eda1d0058118a6d1a
Merge branch 'maint'

* maint:
  gitweb/Makefile: fix typo in gitweb.min.css rule

Conflicts:
gitweb/Makefile
gitweb/Makefile