merge master

author Joakim Verona <joakim@verona.se>

Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)

committer Joakim Verona <joakim@verona.se>

Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)
author Joakim Verona <joakim@verona.se>
Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)
committer Joakim Verona <joakim@verona.se>
Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)
diff --cc configure.ac
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/keyboard.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)
committer	Joakim Verona <joakim@verona.se>
	Sat, 9 Jan 2016 15:42:04 +0000 (16:42 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history