Merge branch 'ss/nedmalloc-compilation' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:07 +0000 (11:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jan 2013 19:17:07 +0000 (11:17 -0800)
commitb48b632cda2d8f74524c448027e867089ddcb44a
treecb041b5d7bc58afabced21c9a86ac8f334a079c4
parentabf3e84b185524aa7903337846578b1486a52758
parent8e679e08a6e12e183aeb068a2ff5d75599d6433d
Merge branch 'ss/nedmalloc-compilation' into maint

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