Merge branch 'jk/maint-t1304-setfacl'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jun 2012 21:42:43 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jun 2012 21:42:44 +0000 (14:42 -0700)
commit2a6291e97a219e660ae7c75f44a55f8c2a331c40
treeb521f4e698a226b4c22a4f749636420faf0cc2a7
parenta88d7aaee8f8b80fdd2b70d38beb534b5102ee7c
parenta14ad109115b29483b6e37d18159d850e2752c72
Merge branch 'jk/maint-t1304-setfacl'

Works around a false test failure caused by a bug in ecryptofs.

* jk/maint-t1304-setfacl:
  t1304: improve setfacl prerequisite setup