From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Jul 2014 19:51:50 +0000 (-0700)
Subject: Merge branch 'maint-1.8.5' into maint
X-Git-Tag: v2.0.2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2f7b1026e33e308782fcb1b60e3d7af107fdc18;p=thirdparty%2Fgit.git

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
---

c2f7b1026e33e308782fcb1b60e3d7af107fdc18