From: Johannes Schlüter <johannes@php.net>
Date: Sun, 23 Feb 2014 13:57:21 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5c8a0c92d12baf7b5c4bb7974e79e36fdd09534e;p=php

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

5c8a0c92d12baf7b5c4bb7974e79e36fdd09534e