From: Lars Strojny <lstrojny@php.net>
Date: Wed, 27 Mar 2013 20:37:42 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=218bcee202ee165da7513cd9cc77bf1820572971;p=php

Merge branch 'PHP-5.5'

Conflicts:
	Zend/zend_ini_scanner.c
---

218bcee202ee165da7513cd9cc77bf1820572971