Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  add new functions and constants for GD
typo and WS
Merge branch 'PHP-5.5'

* PHP-5.5:
  typo and WS
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Merge branch 'PHP-5.5'
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
Merge branch 'PHP-5.4' into PHP-5.5
Update test script
Merge branch 'PHP-5.4' into PHP-5.5
Fixed bug #64515 (Memoryleak when using the same variablename 2times in function declaration)
Merge branch 'PHP-5.5'
fix regression, take #2 (merge issue due to git 1.8 default setting changes)
conflict
Merge branch 'master' of git.php.net:php-src
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
merging conflict left over
 FALSE on error