Fix bug #67060: use default mode of 660
5.5.14 now
Prevent recursion in ZF2 Parameters class
PHP 5.4/5.5 compability in phpdbg_watch.c
Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_array.c
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Optimize ZEND_POW (Rouven Weßling)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
Support for __debugInfo (Joe Watkins)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
fix typo in ODBC code
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  fix typo in ODBC code
  Fix bug #67060: use default mode of 660

Conflicts:
	ext/odbc/php_odbc.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo in ODBC code
  Fix bug #67060: use default mode of 660
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660
Improved test for bug #62479
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Improved test for bug #62479
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Improved test for bug #62479