Merge branch '3.2-maint'

* 3.2-maint:
  Prepare for v3.2.4

Conflicts:
	NEWS.txt

diff --cc NEWS.txt
index 3cb8493ffe4315b0c0fbc626a2a9a93f7ecfa17f,084879ddd10da2ad14617eddd48585cec6b2881b..dac5bfe03e6ee64c0cfc883e8a07c8140f2adfc7
--- 1/NEWS.txt
--- 2/NEWS.txt
+++ b/NEWS.txt
@@@ -2,21 -2,10 +2,23 @@@ ccache new
  ===========
  
  
- Unreleased 3.2.4
- ----------------
 +Unreleased 3.3
 +--------------
 +
 +New features and improvements
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
 +- Added support for cuda including the -optf/--options-file option.
 +
 +
 +Bug fixes
 +~~~~~~~~~
 +
 +
+ ccache 3.2.4
+ ------------
+ Release date: 2015-10-08
+ 
  
  Bug fixes
  ~~~~~~~~~