; Merge from branch 'master'

author Ken Raeburn <raeburn@raeburn.org>

Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)

committer Ken Raeburn <raeburn@raeburn.org>

Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)
author Ken Raeburn <raeburn@raeburn.org>
Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)
committer Ken Raeburn <raeburn@raeburn.org>
Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)
diff --cc configure.ac
Simple merge
diff --cc lisp/frame.el
Simple merge
diff --cc src/alloc.c
Simple merge
author	Ken Raeburn <raeburn@raeburn.org>
	Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)
committer	Ken Raeburn <raeburn@raeburn.org>
	Mon, 31 Jul 2017 05:13:53 +0000 (01:13 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/frame.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/alloc.c	patch \|	diff1 \|	diff2 \|	blob \| history