From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Jul 2010 04:29:21 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78db709ae59da26de76264b79df3a7dc4d87e65c;p=git.git

Merge branch 'maint'

* maint:
  add missing && to submodule-merge testcase
  test-date: fix sscanf type conversion
---

78db709ae59da26de76264b79df3a7dc4d87e65c