Merge branch 'cb/khash-maybe-unused-function'

Build fix. * cb/khash-maybe-unused-function: khash: silence -Wunused-function for delta-islands commit-slabs: move MAYBE_UNUSED out

Junio C Hamano committed Oct 30, 2018 at 15:43 UTC d1622fdbdd83831983e8b99250792e5fca7b9159

No changes.