Merge branch 'gb/maint-am-patch-format-error-message' into maint

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch

Junio C Hamano committed Sep 23, 2011 at 14:11 UTC 40ffc49876611150104102d59a35d865e4670bd7

No changes.