From: Johannes Schlüter <johannes@php.net>
Date: Wed, 18 Apr 2012 22:08:42 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ca4710c9fb09bca31726e902e2eedab6c6abc94;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)
---

9ca4710c9fb09bca31726e902e2eedab6c6abc94