From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 27 Jun 2014 17:52:46 +0000 (+0400)
Subject: Merge branch 'phpng' into call-frame
X-Git-Tag: POST_PHPNG_MERGE~90^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f895de2eefeb711a6640a79d9d011b37c2ed6ee;p=php

Merge branch 'phpng' into call-frame

* phpng:
  Suppress warning
  Refactoring ext/intl (incompleted)
  Fixed build with libmysql
  C++ compiler doesn't allow cast a void * to other pointer type

Conflicts:
	Zend/zend_execute.h
---

2f895de2eefeb711a6640a79d9d011b37c2ed6ee