Merge branch 'maint-1.8.5' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:51:50 +0000 (12:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Jul 2014 19:51:50 +0000 (12:51 -0700)
* maint-1.8.5:
  t7300: repair filesystem permissions with test_when_finished
  enums: remove trailing ',' after last item in enum

1  2 
builtin/clean.c
pretty.c
t/t7300-clean.sh

diff --cc builtin/clean.c
Simple merge
diff --cc pretty.c
Simple merge
Simple merge