Merge branch 'pw/p4-appledouble-fix'
commitde263479506066f240cf629aa3aac50c94668d89
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 05:21:57 +0000 (6 21:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Nov 2011 05:21:57 +0000 (6 21:21 -0800)
tree2cb3992abf176354aed9cef273aa73932ea523e5
parentee6dfb2d83ba1b057943e705f707fa27e34e47f9
parent9f7ef0eaf2e54609128add5e8f9b506bdbb81dff
Merge branch 'pw/p4-appledouble-fix'

* pw/p4-appledouble-fix:
  git-p4: ignore apple filetype
contrib/fast-import/git-p4