Merge branch 'jk/colors'
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2015 23:57:22 +0000 (15:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2015 23:57:22 +0000 (15:57 -0800)
* jk/colors:
parse_color: fix return value for numeric color values 0-8

Trivial merge