From: Emden R. Gansner <erg@alum.mit.edu>
Date: Fri, 16 May 2014 17:50:02 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/ellson/graphviz
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~209^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f727289cd9c4aeed27bfed8fbd1daeaea1b61c4;p=graphviz

Merge branch 'master' of https://github.com/ellson/graphviz

Conflicts:
	lib/dotgen/rank.c
---

0f727289cd9c4aeed27bfed8fbd1daeaea1b61c4