Merge branch 'jn/parse-config-slot' into jk/colors

* jn/parse-config-slot: color_parse: do not mention variable name in error message pass config slots as pointers instead of offsets

Junio C Hamano committed Nov 20, 2014 at 11:40 UTC 62ce40d9338046a89de5d2bfb6b258872fd366c0

No changes.