From: Remi Collet <remi@php.net>
Date: Sat, 28 Dec 2013 13:29:38 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd3e5aab1d675df9bf066d4900e99e78c8eb5564;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  minor fix on previous
---

bd3e5aab1d675df9bf066d4900e99e78c8eb5564