From: Lior Kaplan <kaplanlior@gmail.com>
Date: Fri, 14 Feb 2014 15:15:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~98
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23d952ed60766be772fe72dcdc61407c6231dc18;p=php

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

23d952ed60766be772fe72dcdc61407c6231dc18