Merge branch 'nd/attr-debug-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000 (28 11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Jan 2013 19:13:07 +0000 (28 11:13 -0800)
* nd/attr-debug-fix:
  attr: make it build with DEBUG_ATTR again

1  2 
attr.c

diff --cc attr.c
Simple merge