Merge branch 'PHP-5.4' into PHP-5.5

author Nikita Popov <nikic@php.net>

Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)

committer Nikita Popov <nikic@php.net>

Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)
author Nikita Popov <nikic@php.net>
Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)
committer Nikita Popov <nikic@php.net>
Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)
diff --cc ext/standard/html_tables/html_table_gen.php
Simple merge
author	Nikita Popov <nikic@php.net>
	Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)
committer	Nikita Popov <nikic@php.net>
	Thu, 6 Mar 2014 22:12:41 +0000 (23:12 +0100)