Merge remote-tracking branch 'origin/3.3' into develop

Conflicts: htdocs/install/inc.php
2013-01-28 12:58:16 +01:00 · 2013-01-28 12:58:16 +01:00 · 0beea6c23c
commit 0beea6c23c
parent f75248308d a8ccc0ab0b
1 changed files with 0 additions and 1 deletions
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@ -231,7 +231,6 @@ foreach ($handlers as $handler)
 	if (empty($conf->loghandlers[$handler])) $conf->loghandlers[$handler]=$loghandlerinstance;
 }

-
 // Removed magic_quotes
 if (function_exists('get_magic_quotes_gpc'))	// magic_quotes_* removed in PHP 5.4
 {