Merge pull request #38 from synalysis/master

author John Ellson <john.ellson@comcast.net>

Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)

committer John Ellson <john.ellson@comcast.net>

Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)
author John Ellson <john.ellson@comcast.net>
Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)
committer John Ellson <john.ellson@comcast.net>
Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)
diff --cc lib/cgraph/cgraph.h
Simple merge
diff --cc lib/cgraph/node.c
Simple merge
author	John Ellson <john.ellson@comcast.net>
	Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)
committer	John Ellson <john.ellson@comcast.net>
	Mon, 20 Jul 2015 12:17:47 +0000 (08:17 -0400)
		1	2
lib/cgraph/cgraph.h	patch \|	diff1 \|	diff2 \|	blob \| history
lib/cgraph/node.c	patch \|	diff1 \|	diff2 \|	blob \| history