From: Ferenc Kovacs <tyrael@php.net>
Date: Fri, 27 Jun 2014 14:28:24 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=293a48cb9df040d769e03a8c262e15b9f880333a;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  removing the format added by mistake, props to Solar Designer for spotting this.
---

293a48cb9df040d769e03a8c262e15b9f880333a