Merge branch 'PHP-5.6'

author Anatol Belski <ab@php.net>

Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)

committer Anatol Belski <ab@php.net>

Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
author Anatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
committer Anatol Belski <ab@php.net>
Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
diff --cc ext/odbc/php_odbc.h
Simple merge
diff --cc ext/odbc/php_odbc_includes.h
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 6 Feb 2015 18:05:43 +0000 (19:05 +0100)
		1	2
ext/odbc/php_odbc.h	patch \|	diff1 \|	diff2 \|	blob \| history
ext/odbc/php_odbc_includes.h	patch \|	diff1 \|	diff2 \|	blob \| history