From: Johannes Schlüter <johannes@php.net>
Date: Thu, 14 Aug 2014 15:25:22 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~5^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a68f63156c23a3aebbc4e7068610dbe85c670bda;p=php

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

a68f63156c23a3aebbc4e7068610dbe85c670bda