OCI8 2.0: add oci8-check-connection probe and do some renaming
updated lib versions, the vc11 ones only matter now
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated lib versions, the vc11 ones only matter now
updated lib versions
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated lib versions
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated lib versions
removed the /Wp64 switch as we use true 64 bit compiler now
Merge branch 'PHP-5.5'

* PHP-5.5:
  removed the /Wp64 switch as we use true 64 bit compiler now
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  updated lib versions
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  removed the /Wp64 switch as we use true 64 bit compiler now
  updated lib versions
  updated lib versions, the vc11 ones only matter now
Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  removed the /Wp64 switch as we use true 64 bit compiler now
  updated lib versions
  updated lib versions, the vc11 ones only matter now
Fix bug #65579 (Using traits with get_class_methods causes segfault).

Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
Merge branch 'PHP-5.4' into PHP-5.5
Avoid compiler warning
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
	NEWS
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).