Merge branch 'slurm-2.3'

Conflicts:
	META
	NEWS

NEWS

@@ -89,6 +89,9 @@ documents those changes that are of interest to users and admins.
  -- If job time limit exceeds partition maximum, but job's minimum time limit
     does not, set job's time limit to partition maximum at allocation time.
 
+* Changes in SLURM 2.3.3
+========================
+
 * Changes in SLURM 2.3.2
 ========================
  -- Add configure option of "--without-rpath" which builds SLURM tools without