From: Stanislav Malyshev <stas@php.net>
Date: Mon, 19 May 2014 06:46:30 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~272^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7df1e42d8a134bdcc63ce33a6f7be8cdbc75de58;p=php

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

7df1e42d8a134bdcc63ce33a6f7be8cdbc75de58