From: Derick Rethans <github@derickrethans.nl>
Date: Sat, 4 Oct 2014 14:59:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~59^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e5f475f5e3e049c428fe2857f910ab36201c071;p=php

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

0e5f475f5e3e049c428fe2857f910ab36201c071