]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Tue, 2 Feb 2016 13:27:30 +0000 (14:27 +0100)
committerAnatol Belski <ab@php.net>
Tue, 2 Feb 2016 13:27:30 +0000 (14:27 +0100)
* PHP-5.6:
  add error check to sysconf call
  Going for 5.5.33 now


Trivial merge