Merge remote-tracking branch 'origin/master' into xwidget_mvp

author Joakim Verona <joakim@verona.se>

Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)

committer Joakim Verona <joakim@verona.se>

Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)
author Joakim Verona <joakim@verona.se>
Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)
committer Joakim Verona <joakim@verona.se>
Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)
diff --cc src/buffer.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
author	Joakim Verona <joakim@verona.se>
	Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)
committer	Joakim Verona <joakim@verona.se>
	Thu, 7 May 2015 14:25:41 +0000 (16:25 +0200)
		1	2
src/buffer.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history