Merge branch 'maint-1.8.5' into maint
commitc2f7b1026e33e308782fcb1b60e3d7af107fdc18
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:51:50 +0000 (2 12:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:51:50 +0000 (2 12:51 -0700)
tree8768ef958c9dea375afcada68df1d0f1ae6d59c3
parent341e7e8eda3dbeb6867f4f8f45b671201b807de5
parent45067fc973c31953ab283f77f0f91eba9a272624
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
builtin/clean.c
pretty.c
t/t7300-clean.sh