From: Lior Kaplan <kaplanlior@gmail.com>
Date: Sun, 17 Aug 2014 12:48:22 +0000 (+0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.17RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be2128c8050fd8d22604acb0e225891551c81c8c;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  typofixes
---

be2128c8050fd8d22604acb0e225891551c81c8c