From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 22 Apr 2013 16:51:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~23^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf0d902a84cb6f2426616d40cbd05a5c1c5e61ad;p=php

Merge branch 'PHP-5.5'
---

cf0d902a84cb6f2426616d40cbd05a5c1c5e61ad