Merge branch 'master' into xwidget_mvp

author Joakim Verona <joakim@verona.se>

Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)

committer Joakim Verona <joakim@verona.se>

Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)
author Joakim Verona <joakim@verona.se>
Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)
committer Joakim Verona <joakim@verona.se>
Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)
diff --cc src/emacs.c
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Joakim Verona <joakim@verona.se>
	Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)
committer	Joakim Verona <joakim@verona.se>
	Tue, 17 Mar 2015 19:29:45 +0000 (20:29 +0100)
		1	2
src/emacs.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history