add new consts
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
add text for the new constants
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	UPGRADING
Merge branch 'master' of git.php.net:php-src