]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 19 May 2014 06:44:33 +0000 (23:44 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 19 May 2014 06:44:33 +0000 (23:44 -0700)
commitfc076ef60531375214ee5e4252308edc6b98645f
tree62cf7e68ddefef00caaede1e0c6690b2e3e6d2f9
parent5164b81324ac7a9580ad1a9db690064c97fd28e3
parentfa6aaf8c03df74aeb45cefd3e961583155fa31c8
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