Merge branch 'ss/nedmalloc-compilation'
commit0266f4688ce2eab25629a2aa4ccd5032944311c8
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:14:10 +0000 (3 10:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Jan 2013 18:14:10 +0000 (3 10:14 -0800)
tree27e637f7f9b0d4e31ecb64016fb7d04d5066b6d4
parentcd46f2e59de2df74844c9c594bfbfcdea24acd23
parent8e679e08a6e12e183aeb068a2ff5d75599d6433d
Merge branch 'ss/nedmalloc-compilation'

* ss/nedmalloc-compilation:
  nedmalloc: Fix a compile warning (exposed as error) with GCC 4.7.2