Merge branch '2.5' of github.com:cakephp/cakephp into 2.5

lib/Cake/View/Helper/FormHelper.php

@@ -561,7 +561,7 @@ class FormHelper extends AppHelper {
 		}
 		$locked = array();
 		$unlockedFields = $this->_unlockedFields;
-		
+
 		foreach ($fields as $key => $value) {
 			if (!is_int($key)) {
 				$locked[$key] = $value;