From: Anatol Belski <ab@php.net>
Date: Wed, 2 Jul 2014 09:35:42 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=131e60ce569631b5b7c61b8392f545dde936df3e;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

131e60ce569631b5b7c61b8392f545dde936df3e