From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jun 2012 21:42:43 +0000 (-0700)
Subject: Merge branch 'jk/maint-t1304-setfacl'
X-Git-Tag: v1.7.12-rc0~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2a6291e97a219e660ae7c75f44a55f8c2a331c40;p=git.git

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

2a6291e97a219e660ae7c75f44a55f8c2a331c40