From: Ferenc Kovacs <tyrael@php.net>
Date: Fri, 27 Jun 2014 14:29:35 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~154^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99967ac0754cdd4a7ecd63589083703c6998ae97;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

99967ac0754cdd4a7ecd63589083703c6998ae97