From: Derick Rethans <github@derickrethans.nl>
Date: Mon, 11 Mar 2013 21:36:42 +0000 (+0000)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0ddcf70e48c9cee025181f0b0f0259faec8aa51;p=php

Merge branch 'PHP-5.5'
---

d0ddcf70e48c9cee025181f0b0f0259faec8aa51