From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 13 May 2012 18:48:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~207
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8da61c62d931bb76faba55bb2fcbd1938b2f96fc;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix grammo
---

8da61c62d931bb76faba55bb2fcbd1938b2f96fc