Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	ext/standard/tests/general_functions/bug60723.phpt

Author: laruence

ext/standard/tests/general_functions/bug60723.phpt

@@ -9,9 +9,11 @@ $dir = dirname(__FILE__);
 $log = $dir . "/tmp.err";
 ini_set("error_log", $log);
 echo $aa;
+error_log("dummy");
 readfile($log);
 unlink($log);
 ?>
 --EXPECTF--
 Notice: Undefined variable: aa in %sbug60723.php on line %d
 [%s ASIA/Chongqing] PHP Notice:  Undefined variable: aa in %sbug60723.php on line %d
+[%s ASIA/Chongqing] dummy