Merge from default.

author David Given <dg@cowlark.com>

Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)

committer David Given <dg@cowlark.com>

Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)
author David Given <dg@cowlark.com>
Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)
committer David Given <dg@cowlark.com>
Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)
diff --cc util/ncgg/cgg.y
Simple merge
diff --cc util/ncgg/extern.h
Simple merge
author	David Given <dg@cowlark.com>
	Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)
committer	David Given <dg@cowlark.com>
	Thu, 15 Sep 2016 20:59:01 +0000 (22:59 +0200)
		1	2
util/ncgg/cgg.y	patch \|	diff1 \|	diff2 \|	blob \| history
util/ncgg/extern.h	patch \|	diff1 \|	diff2 \|	blob \| history