]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Thu, 10 Dec 2015 12:34:15 +0000 (15:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 10 Dec 2015 12:34:15 +0000 (15:34 +0300)
* 'master' of git.php.net:php-src:
  The first arg is optional
  Return -1 seems bug here


Trivial merge