From: Remi Collet <remi@php.net>
Date: Mon, 4 Aug 2014 09:09:04 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~28^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71a3076560c8802de8d3b74b97ff46523a75479e;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  typo
  typo
---

71a3076560c8802de8d3b74b97ff46523a75479e