]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJoe Watkins <krakjoe@php.net>
Wed, 4 May 2016 16:04:49 +0000 (17:04 +0100)
committerJoe Watkins <krakjoe@php.net>
Wed, 4 May 2016 16:04:49 +0000 (17:04 +0100)
* PHP-7.0:
  correct wording

1  2 
Zend/zend_API.h

diff --cc Zend/zend_API.h
Simple merge