]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorYasuo Ohgaki <yohgaki@php.net>
Tue, 18 Oct 2016 00:14:48 +0000 (09:14 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Tue, 18 Oct 2016 00:14:48 +0000 (09:14 +0900)
* PHP-7.0:
  Fix bug #47890 #73215 uniqid() should use better random source


Trivial merge