Merge branch 'hn/log-graph-color-octopus'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:21 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:21 +0000 (12:10 -0700)
* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges

Trivial merge