]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 09:35:03 +0000 (13:35 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 15 May 2014 09:35:03 +0000 (13:35 +0400)
* 'phpng' of git.php.net:php-src:
  forgot that hash uses ending 0
  fix ts build


Trivial merge