From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 20:40:45 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~129^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a91d1bb9a348bb8b069144cb7f7b3d057ffaf47d;p=php

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

a91d1bb9a348bb8b069144cb7f7b3d057ffaf47d