Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Jul 2010 04:29:21 +0000 (21:29 -0700)
commit78db709ae59da26de76264b79df3a7dc4d87e65c
treee96f2af98f008112b74b3c7649ff723e8a1160ed
parent5b5275f6e9ca6284ca123f729d5a78f409e448fb
parent420432d4342e214c15f063a630a883072d4e5779
Merge branch 'maint'

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