Merge branch 'maint-1.8.5' into maint

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

Junio C Hamano committed Jul 2, 2014 at 12:51 UTC c2f7b1026e33e308782fcb1b60e3d7af107fdc18

No changes.