From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 19 Dec 2013 18:58:45 +0000 (+0000)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.8RC1~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a402ca51e0940941811eb6e4056ee0f0111eeb0;p=php

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

7a402ca51e0940941811eb6e4056ee0f0111eeb0