From: Tjerk Meesters <datibbaw@php.net>
Date: Sat, 12 Jul 2014 03:10:15 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC3~1^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=18feaf94166b2c80fe788971a6db74e2e95a9cfe;p=php

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

18feaf94166b2c80fe788971a6db74e2e95a9cfe