From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Mon, 21 Oct 2013 00:56:14 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e4651f6f181e0d90daab2a97fb57a76fe105a29;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix typo
---

9e4651f6f181e0d90daab2a97fb57a76fe105a29