5.4.12-dev
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.12-dev
  This will be PHP 5.3.22

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  remove set but not used variables
Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.12-dev