Merge branch 'js/nedmalloc-gcc6-warnings'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:42 +0000 (14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:43 +0000 (14:48 -0700)
Squelch compiler warnings for netmalloc (in compat/) library.

* js/nedmalloc-gcc6-warnings:
nedmalloc: work around overzealous GCC 6 warning
nedmalloc: fix misleading indentation

Trivial merge