Merge branch 'ja/directory-attrs'
authorJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:46 +0000 (5 23:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 6 Jan 2013 07:41:46 +0000 (5 23:41 -0800)
The attribute mechanism didn't allow limiting attributes to be
applied to only a single directory itself with "path/" like the
exclude mechanism does.

* ja/directory-attrs:
  Add directory pattern matching to attributes


Trivial merge