Merge upstream/2.5 into 2.5

.gitattributes

@@ -9,7 +9,6 @@
 *.ctp text
 *.sql text
 *.md text
-*.mo text
 *.po text
 *.js text
 *.css text
@@ -30,4 +29,5 @@
 *.png binary
 *.jpg binary
 *.gif binary
-*.ico binary
+*.ico binary
+*.mo binary

lib/Cake/Model/Datasource/Database/Mysql.php

@@ -118,7 +118,6 @@ class Mysql extends DboSource {
 		'biginteger' => array('name' => 'bigint', 'limit' => '20'),
 		'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'),
 		'float' => array('name' => 'float', 'formatter' => 'floatval'),
-		'numeric' => array('name' => 'decimal', 'formatter' => 'floatval'),
 		'decimal' => array('name' => 'decimal', 'formatter' => 'floatval'),
 		'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
 		'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),