add new charset, from MySQL 5.6
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Merge branch 'master' of ssh://git.php.net/php-src
Merge branch 'PHP-5.5' of ssh://git.php.net/php-src into PHP-5.5
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
check the validity of the parameter
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'