]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Fri, 16 May 2014 12:35:37 +0000 (16:35 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 16 May 2014 12:35:37 +0000 (16:35 +0400)
* 'phpng' of git.php.net:php-src:
  hash find returns zval* now


Trivial merge