From: Johannes Schlüter <johannes@php.net>
Date: Wed, 3 Jul 2013 14:58:20 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=631bb27dcacf625e35f6dacc5e8df0b45624531a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/acinclude.m4
---

631bb27dcacf625e35f6dacc5e8df0b45624531a