This will be PHP 5.3.22
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
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
Fixed bug #63899 (Use after scope error in zend_compile)
Merge branch 'PHP-5.3' into PHP-5.4
Update NEWS
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Improve resource management for curl handle

Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.
Merge branch 'PHP-5.5'

* PHP-5.5:
  Improve resource management for curl handle
Bug #63699 performance improvements for ext/date by only validating timezone when timezone is set
Merge branch 'PHP-5.5'
Bug #63699: performance improvements for varios ext/date functions
Adding test from 5.5
bump year