From: Derick Rethans <github@derickrethans.nl>
Date: Wed, 27 Nov 2013 22:01:09 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~168^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3a12317cf0db242bed32c14ec094a24ace1047a;p=php

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

d3a12317cf0db242bed32c14ec094a24ace1047a