Merge branch 'maint-1.8.5' into maint-1.9

* maint-1.8.5: annotate: use argv_array t7300: repair filesystem permissions with test_when_finished enums: remove trailing ',' after last item in enum

Junio C Hamano committed Jul 16, 2014 at 11:10 UTC d22acacf810a92d5634099a7db0367ce5b6fdcef

No changes.