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

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

* 'phpng' of git.php.net:php-src:
  fix leak
  zend_hash_del>zend_hash_str_del
  unused local var
---

5e7e299a344621f17ad31c948a94253e49826ed5