Merge branch 'jk/colors'

* jk/colors: parse_color: fix return value for numeric color values 0-8

Junio C Hamano committed Jan 20, 2015 at 15:57 UTC d06ce4a508386230e9412e68264a744392795dcb

No changes.