From: Christopher Jones <sixd@php.net>
Date: Sun, 18 Nov 2012 22:20:53 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.10RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75746d60b6e6a45512842e222429c127be58b733;p=php

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
---

75746d60b6e6a45512842e222429c127be58b733