From: Stanislav Malyshev <stas@php.net>
Date: Sun, 8 Jun 2014 22:54:32 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~226^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19edbc97205fbaa4bb1272b57708203826898dea;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed identation on file
  Fix align indentation
---

19edbc97205fbaa4bb1272b57708203826898dea