From: Pierre Joye <pierre.php@gmail.com>
Date: Mon, 25 Mar 2013 12:42:42 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~89
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=317168bb1efa519a0af61e34fc6581118b1f81b2;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  typo and WS
---

317168bb1efa519a0af61e34fc6581118b1f81b2