From: Stanislav Malyshev <stas@php.net>
Date: Mon, 7 Jul 2014 07:49:15 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96c9cc315d8dea5b0d2c8b855620e3723d149470;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix format
---

96c9cc315d8dea5b0d2c8b855620e3723d149470