From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 Nov 2010 01:52:31 +0000 (-0800)
Subject: Merge branch 'ak/apply-non-git-epoch'
X-Git-Tag: v1.7.4-rc0~114
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f565f6e06511249c8c3690277023a8550dbdfb47;p=git.git

Merge branch 'ak/apply-non-git-epoch'

* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone
---

f565f6e06511249c8c3690277023a8550dbdfb47