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

Merge branch 'PHP-5.4' into PHP-5.5

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

de1688d16e19cb799341b05f15c22d5f4cfa6efb