Merge branch '3.2-maint'

author Joel Rosdahl <joel@rosdahl.net>

Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)

committer Joel Rosdahl <joel@rosdahl.net>

Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)
author Joel Rosdahl <joel@rosdahl.net>
Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)
committer Joel Rosdahl <joel@rosdahl.net>
Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)
diff --cc NEWS.txt
Simple merge
diff --cc ccache.c
Simple merge
author	Joel Rosdahl <joel@rosdahl.net>
	Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)
committer	Joel Rosdahl <joel@rosdahl.net>
	Fri, 25 Mar 2016 20:10:40 +0000 (21:10 +0100)
		1	2
NEWS.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ccache.c	patch \|	diff1 \|	diff2 \|	blob \| history