From: Remi Collet <remi@php.net>
Date: Sat, 28 Dec 2013 13:29:27 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=809eb77689fc3c4f960dad3ec85a7d7bfde87ea0;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

809eb77689fc3c4f960dad3ec85a7d7bfde87ea0