From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 15 May 2014 09:35:03 +0000 (+0400)
Subject: Merge branch 'phpng' of git.php.net:php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~359^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=154976f711c1b8d008a6114be3d5bd608620b238;p=php

Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  forgot that hash uses ending 0
  fix ts build
---

154976f711c1b8d008a6114be3d5bd608620b238