From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 1 Sep 2014 15:40:54 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.1RC1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f89b7ec38950e39b9bb1b566b6c567382c42248f;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

f89b7ec38950e39b9bb1b566b6c567382c42248f