From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 28 Jan 2014 12:34:33 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~29^2~8^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18c2d4500622d71e5754eb60abbaa1e46998b110;p=php

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

18c2d4500622d71e5754eb60abbaa1e46998b110