]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1c944d adc070c)
Merge branch 'PHP-5.3' into PHP-5.4
authorStanislav Malyshev <stas@php.net>
Mon, 19 May 2014 06:43:59 +0000 (23:43 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 19 May 2014 06:43:59 +0000 (23:43 -0700)
* PHP-5.3:
  fix typo in ODBC code
  Fix bug #67060: use default mode of 660

Conflicts:
ext/odbc/php_odbc.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.