From: Nikita Popov <nikic@php.net>
Date: Mon, 30 Dec 2013 12:58:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~67
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71a36fb6aeb7b51b2819d857162564dbbbccae59;p=php

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

71a36fb6aeb7b51b2819d857162564dbbbccae59