Merge branch 'v4.8.x'

author Arun Persaud <arun@nubati.net>

Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)

committer Arun Persaud <arun@nubati.net>

Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)
author Arun Persaud <arun@nubati.net>
Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)
committer Arun Persaud <arun@nubati.net>
Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)
diff --cc Makefile.am
Simple merge
diff --cc gtk/xboard.c
Simple merge
diff --cc gtk/xoptions.c
Simple merge
author	Arun Persaud <arun@nubati.net>
	Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)
committer	Arun Persaud <arun@nubati.net>
	Sat, 5 Mar 2016 21:04:43 +0000 (13:04 -0800)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/xboard.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/xoptions.c	patch \|	diff1 \|	diff2 \|	blob \| history