]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:14:46 +0000 (17:14 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 01:14:46 +0000 (17:14 -0800)
* PHP-5.6:
  Update CODING_STANDARDS


Trivial merge