From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 18 May 2014 13:06:44 +0000 (+0800)
Subject: Merge branch 'phpng' of git.php.net:/php-src into phpng
X-Git-Tag: POST_PHPNG_MERGE~328^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=583bb6339b03ac64ab38dee792e4aedeaa7d5f07;p=php

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

Conflicts:
	ext/pdo/pdo_sql_parser.c
---

583bb6339b03ac64ab38dee792e4aedeaa7d5f07