tree 9773353087b0423a17a0202fdd9e1f496fb6b8b7
parent 7025616048e2cdf61b7f5c6e4fba8045020fb537
parent 712efb1a42c8012e5d49f288bf7307e2da09d646
author Junio C Hamano <gitster@pobox.com> 1359400387 -0800
committer Junio C Hamano <gitster@pobox.com> 1359400387 -0800

Merge branch 'nd/attr-debug-fix' into maint

* nd/attr-debug-fix:
  attr: make it build with DEBUG_ATTR again