Merge branch 'rp/p4-filetype-change'

* rp/p4-filetype-change: git-p4.py: add support for filetype change

Junio C Hamano committed Jan 26, 2016 at 15:40 UTC c7dd1c5818111a86deffde1190b57d07efbeed0a

No changes.