Bug #67965: Fix blocking behavior in non-blocking crypto streams
Bug #41631: Fix regression from first attempt (6569db8)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug #41631: Fix regression from first attempt (6569db8)
  Bug #67965: Fix blocking behavior in non-blocking crypto streams
update NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
Merge branch 'master' of git://github.com/php/php-src
FR #67990 - Added nowait argument to sem_acquire
Merge branch 'PHP-5.6'

* PHP-5.6:
  FR #67990 - Added nowait argument to sem_acquire
Don't miss warning messages
basic datatype fixes for ext/oci8
first shot on fixing ext/oci8
second big shot on porting ext/oci8

still a lot to do, but most raw things done
replace zend_hash_find with zend_hash_str_find which fixes leaking the key
make LTP version check a blacklist
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  make LTP version check a blacklist
Merge branch 'PHP-5.6'

* PHP-5.6:
  make LTP version check a blacklist
fix precision when fetching float through mysqlnd

fixes failing ext/mysqli/tests/010.phpt
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix precision when fetching float through mysqlnd