Merge branch 'jk/colors'
commitd06ce4a508386230e9412e68264a744392795dcb
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2015 23:57:22 +0000 (20 15:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Jan 2015 23:57:22 +0000 (20 15:57 -0800)
treef0b6b3a042480e1c81eb72a0a5b1d8226fb590df
parenta94655dcfedc6b266ba32a3d32b0d52a1ce6a928
parent3759d27aca3ddd78b4b1169a767809748dc1fc3f
Merge branch 'jk/colors'

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