From: Ferenc Kovacs <tyrael@php.net>
Date: Sat, 12 Apr 2014 23:56:47 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.12RC1~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2876bde63494129b78c393851c5f8101e6f9fdf0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
---

2876bde63494129b78c393851c5f8101e6f9fdf0