Merge branch 'sb/misc-cleanups'

* sb/misc-cleanups: submodule-config: don't shadow `cache` config.c: drop local variable

Junio C Hamano committed May 10, 2016 at 13:40 UTC 934908ae5bcd7b9944d925f73e05c60b2687c8b7

No changes.