Merge branch 'jb/required-filter'

* jb/required-filter: Add a setting to require a filter to be successful Conflicts: convert.c

Junio C Hamano committed Feb 28, 2012 at 13:25 UTC 524ee675a36961c5b59302e84ffd08808f4f787e

No changes.