]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 13 May 2015 07:10:14 +0000 (10:10 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 13 May 2015 07:10:14 +0000 (10:10 +0300)
* 'master' of git.php.net:php-src:
  fix build, catch up with linux part for #66048


Trivial merge