]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:10 +0000 (12:41 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 20:41:10 +0000 (12:41 -0800)
* 'PHP-5.5' of git.php.net:php-src:
  - Updated to version 2015.1 (2015a)


Trivial merge