From: Anatol Belski <ab@php.net>
Date: Wed, 10 Jun 2015 11:16:29 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.11RC1~13^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1f3403c9815c05fd14bdcc5954e58e25810bf1f;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  regenerated the ini scanner
---

b1f3403c9815c05fd14bdcc5954e58e25810bf1f