From: Stanislav Malyshev <stas@php.net>
Date: Mon, 19 May 2014 06:43:59 +0000 (-0700)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.30RC1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa6aaf8c03df74aeb45cefd3e961583155fa31c8;p=php

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
---

fa6aaf8c03df74aeb45cefd3e961583155fa31c8