]> granicus.if.org Git - php/commit
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)
commit5272d6c896b955d85a527f5a83da3ec8b434bb5a
tree3a26b70c710eddcbc0f5a0da11f70362f80f8923
parent0df431482fba37a3dac433d52cf339f55e81f817
parent8b903f24d5c2df07fe007c8c9bd48283813c8e21
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix a compiler warning in php_rand.h