add external 2.1 detection and fix gd_compat for 2.1+
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  add external 2.1 detection and fix gd_compat for 2.1+
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  add external 2.1 detection and fix gd_compat for 2.1+
Merge branch 'PHP-5.5'

* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
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 #64342 ZipArchive::addFile() has to check for file existence
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
updated NEWS
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
update NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'master' of git.php.net:php-src
Added opcache related entries
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added opcache related entries
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence