From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 31 Mar 2013 09:39:11 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc6e26cdee58eaea34e3568f2b6051449704084f;p=php

Merge branch 'PHP-5.5'
---

bc6e26cdee58eaea34e3568f2b6051449704084f