From: Stanislav Malyshev <stas@php.net>
Date: Sun, 4 Aug 2013 23:02:53 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~347^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3626db6142eda230586357a707b6cb4a0887e971;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
---

3626db6142eda230586357a707b6cb4a0887e971