Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
merging conflict left over
 FALSE on error
Merge branch 'PHP-5.5'

* PHP-5.5:
  FALSE on error
versions no longer supported, no need to check
Merge branch 'PHP-5.5'

* PHP-5.5:
  versions no longer supported, no need to check
add windows 8 and windows server 2012
Merge branch 'PHP-5.5'

* PHP-5.5:
  add windows 8 and windows server 2012
add WebP support in phpinfo
Merge branch 'PHP-5.5'

* PHP-5.5:
  add WebP support in phpinfo
Added description for opcache.enable_cli
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added description for opcache.enable_cli
Added opcache.enable_cli=0
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache.enable_cli=0
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  add WebP support in phpinfo