From: Xinchen Hui <laruence@php.net>
Date: Fri, 20 Apr 2012 16:12:10 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=465e9a1321593eee949f2cc6e05ade56e0119bb4;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed typo
---

465e9a1321593eee949f2cc6e05ade56e0119bb4