]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:14:37 +0000 (19:14 +0100)
committerAnatol Belski <ab@php.net>
Thu, 18 Feb 2016 18:14:37 +0000 (19:14 +0100)
* PHP-7.0:
  Bug #71596 Segmentation fault on ZTS with date function (setlocale)


Trivial merge