Merge branch 'nd/attr-debug-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000 (11:13 -0800)
commit6d7c1c88940320c2ccde9d996181826a38ff7a81
tree9773353087b0423a17a0202fdd9e1f496fb6b8b7
parent7025616048e2cdf61b7f5c6e4fba8045020fb537
parent712efb1a42c8012e5d49f288bf7307e2da09d646
Merge branch 'nd/attr-debug-fix' into maint

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