Merge branch 'ak/apply-non-git-epoch'
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)
* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone

1  2 
builtin/apply.c

diff --cc builtin/apply.c
Simple merge