5.4.13 branched, now it's 5.4.14
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.13 branched, now it's 5.4.14

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

* PHP-5.5:
  5.4.13 branched, now it's 5.4.14