Merge branch 'ak/apply-non-git-epoch'
commitf565f6e06511249c8c3690277023a8550dbdfb47
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:31 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:31 +0000 (29 17:52 -0800)
treeb2e897cd8dc1539ad3f27d78282f55ff4efd2418
parentfeedaf43dbf31b18d96c4116e3b3f0c522b2cd7b
parent2d502e1f378a39ef375d6d5c1b3312d286ed2524
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
builtin/apply.c