5.5.12RC1 setup
5.4.29 is next
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.29 is next

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.29 is next
  5.5.12RC1 setup

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.29 is next
  5.5.12RC1 setup
Merge branch 'master' of git://github.com/php/php-src