From: Derick Rethans <github@derickrethans.nl>
Date: Fri, 13 Jun 2014 22:26:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~191^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a06dabb5e9e7b3b1425c8c255aa9b2e93dda407e;p=php

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

a06dabb5e9e7b3b1425c8c255aa9b2e93dda407e