Merge branch 'cb/array-size' into maint

* cb/array-size: Fix definition of ARRAY_SIZE for non-gcc builds

Junio C Hamano committed Jun 25, 2015 at 23:03 UTC b1f0802e9127b117bae7a4cfdc81495f7a9a09f3

No changes.