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

Merge branch 'PHP-5.5'
---

6cdf3791854e874117798b3f4a3ba4a72c8a5943