From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 10 Apr 2014 05:06:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cc93aa9a6a7a82e9f9ff27a81f624d61a8e984d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix typo
  fix typo
---

5cc93aa9a6a7a82e9f9ff27a81f624d61a8e984d