From: Remi Collet <remi@php.net>
Date: Sun, 20 Jul 2014 09:15:59 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~67^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d55f23ea5a5565fa0f0439e0fa5706dcf49aa6af;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  See bug #67635
---

d55f23ea5a5565fa0f0439e0fa5706dcf49aa6af