From: Nikita Popov <nikic@php.net>
Date: Thu, 6 Mar 2014 22:15:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=200c97829d79650f91e6939070a7db9790d0ec4a;p=php

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

200c97829d79650f91e6939070a7db9790d0ec4a