Merge branch 'PHP-5.5' into PHP-5.6

author Anatol Belski <ab@php.net>

Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)

committer Anatol Belski <ab@php.net>

Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)
author Anatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)
committer Anatol Belski <ab@php.net>
Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)
diff --cc ext/pdo_mysql/mysql_driver.c
Simple merge
diff --cc main/snprintf.c
Simple merge
author	Anatol Belski <ab@php.net>
	Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)
committer	Anatol Belski <ab@php.net>
	Sat, 6 Dec 2014 11:18:05 +0000 (12:18 +0100)
		1	2
ext/pdo_mysql/mysql_driver.c	patch \|	diff1 \|	diff2 \|	blob \| history
main/snprintf.c	patch \|	diff1 \|	diff2 \|	blob \| history