Merge branch 'release' into testserver-stable

Conflicts:
	includes/account.php
	scripts/cron/warning.php
	www/disputes.php
	www/index.php

3 files changed, 2 insertions, 3 deletions

diff --git a/scripts/cron/warning.php b/scripts/cron/warning.php
index 813f402..59b1aa2 100755
--- a/scripts/cron/warning.php
+++ b/scripts/cron/warning.php
@@ -18,8 +18,8 @@
 */
 
 	require_once(dirname(__FILE__).'/../../includes/mysql.php');
-	require_once(dirname(__FILE__).'/../../includes/lib/l10n.php');
 	require_once(dirname(__FILE__).'/../../includes/lib/general.php');
+	require_once(dirname(__FILE__).'/../../includes/lib/l10n.php');
 
 	$days = array("1" => "3", "15" => "2", "30" => "1", "45" => "0");
 
diff --git a/www/disputes.php b/www/disputes.php
index bd6d5c1..0034b93 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -17,8 +17,8 @@
 */ ?>
 <?
 	require_once("../includes/loggedin.php");
-	require_once("../includes/lib/l10n.php");
 	require_once("../includes/notary.inc.php");
+	require_once("../includes/lib/l10n.php");
 
 	loadem("account");
 
diff --git a/www/index.php b/www/index.php
index d16290a..b1efbfe 100644
--- a/www/index.php
+++ b/www/index.php
@@ -589,7 +589,6 @@ if ($oldid == 52 )
 		header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
 	}
 
-
 	showheader(_("Welcome to CAcert.org"));
 	includeit($id);
 	showfooter();