Merge branch 'PHP-5.4'

author ULF WENDEL <uw@php.net>

Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)

committer ULF WENDEL <uw@php.net>

Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)
author ULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)
committer ULF WENDEL <uw@php.net>
Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)
diff --cc ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
Simple merge
author	ULF WENDEL <uw@php.net>
	Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)
committer	ULF WENDEL <uw@php.net>
	Sat, 29 Sep 2012 10:21:55 +0000 (12:21 +0200)