From: Andrey Hristov <andrey@php.net>
Date: Wed, 9 Jan 2013 18:03:56 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=790096b68b2a58eb691e8a6f33325e8826bec263;p=php

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	ext/mysqlnd/mysqlnd_enum_n_def.h
---

790096b68b2a58eb691e8a6f33325e8826bec263