From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jan 2010 22:57:37 +0000 (-0800)
Subject: Merge branch 'jc/maint-reflog-bad-timestamp'
X-Git-Tag: v1.7.0-rc1~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/103209c6782586d92b04ee1fc71c0fd6f6385f5f?hp=--cc

Merge branch 'jc/maint-reflog-bad-timestamp'

* jc/maint-reflog-bad-timestamp:
t0101: use a fixed timestamp when searching in the reflog
Update @{bogus.timestamp} fix not to die()
approxidate_careful() reports errorneous date string
---

103209c6782586d92b04ee1fc71c0fd6f6385f5f