From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:16:32 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc0~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c307fbfdc403a59dc33209677a02bb5e88487185;p=git.git

Merge branch 'maint'

* maint:
  t7403: add missing &&'s
  Tell ignore file about generate files in /gitweb/static
---

c307fbfdc403a59dc33209677a02bb5e88487185