Merge branch 'master' into cairo

author Jan D <jan.h.d@swipnet.se>

Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)

committer Jan D <jan.h.d@swipnet.se>

Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
author Jan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
committer Jan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/font.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xterm.c
Simple merge
author	Jan D <jan.h.d@swipnet.se>
	Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
committer	Jan D <jan.h.d@swipnet.se>
	Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/font.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xfns.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/xterm.c	patch \|	diff1 \|	diff2 \|	blob \| history