Fix bug #67060: use default mode of 660
5.5.14 now
PHP 5.4/5.5 compability in phpdbg_watch.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
Optimize ZEND_POW (Rouven Weßling)
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
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
Add microseconds to the serialised form of DateTime objects.

Fixes bug #67308 (Serialize of DateTime truncates fractions of second).
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add microseconds to the serialised form of DateTime objects.
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
Fix run-tests.php with Valgrind >= 3.10.0.

The version test that we had in run-tests.php assumed that the major and minor
version numbers were always single digits. This removes that assumption and
also uses version_compare() for the comparison instead of naively converting it
to an integer.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix run-tests.php with Valgrind >= 3.10.0.

Conflicts:
	run-tests.php
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix run-tests.php with Valgrind >= 3.10.0.
Fix broken test caused by fdb2709.