Fix bug #67060: use default mode of 660
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
Improved test for bug #62479
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  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.
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
Fix broken test caused by fdb2709.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test caused by fdb2709.

Conflicts:
	ext/intl/tests/dateformat_format.phpt
Further test fixes for the fdb2709 breakage.
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
Fix broken Junit output with --disable-cgi
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken Junit output with --disable-cgi
Fixed issue #183 (TMP_VAR is not only used once)
Update NEWs and add a test
fix my last commit with some locales
Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS

Upstream fix: https://github.com/file/file/commit/f97486ef5dc3e8735440edc4fc8808c63e1a3ef0