Merge branch 'PHP-5.5' into PHP-5.6

author Andrey Hristov <andrey@php.net>

Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)

committer Andrey Hristov <andrey@php.net>

Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)
author Andrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)
committer Andrey Hristov <andrey@php.net>
Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)
diff --cc ext/mysqlnd/mysqlnd_enum_n_def.h
Simple merge
diff --cc ext/pdo/pdo_dbh.c
Simple merge
author	Andrey Hristov <andrey@php.net>
	Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)
committer	Andrey Hristov <andrey@php.net>
	Tue, 28 Jan 2014 13:38:14 +0000 (15:38 +0200)
		1	2
ext/mysqlnd/mysqlnd_enum_n_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/pdo/pdo_dbh.c	patch \|	diff1 \|	diff2 \|	blob \| history