From: Bob Weinand <bobwei9@hotmail.com>
Date: Thu, 20 Feb 2014 16:49:45 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe3c8de9d5d25190dcd77db6e434f0614abb1847;p=php

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

fe3c8de9d5d25190dcd77db6e434f0614abb1847