]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 8 Jun 2014 22:54:49 +0000 (15:54 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 8 Jun 2014 22:54:49 +0000 (15:54 -0700)
* PHP-5.6:
  Fixed identation on file
  Fix align indentation


Trivial merge