From: Stanislav Malyshev <stas@php.net>
Date: Mon, 10 Jun 2013 08:42:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~29^2~18^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20df5f8f24bdb9fe086ae7fb95de95e51984c46c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix spelling and correct typo.
---

20df5f8f24bdb9fe086ae7fb95de95e51984c46c