]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorNikita Popov <nikic@php.net>
Fri, 25 Mar 2016 19:23:04 +0000 (20:23 +0100)
committerNikita Popov <nikic@php.net>
Fri, 25 Mar 2016 19:23:04 +0000 (20:23 +0100)
commitbd90f5507f63b2b624c9ad04668c67cc3d1b8952
tree024de0000483e46870ee589fa10b50ed902474e8
parent1929fc9b16c836c1449dee3fd3570031ff8dcba1
parent54da966883bacf28808e26eeda48fe38e21b118e
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/standard/crypt.c
NEWS
ext/standard/crypt.c