]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:36:36 +0000 (16:36 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:36:36 +0000 (16:36 -0700)
* PHP-5.5:
  Fix a compiler warning in php_rand.h


Trivial merge