Merged Revisions 3771-3801 from stable branch.

72695f03 · tbrehm · a126d73f · 72695f03 · 72695f03 · 72695f03
Commit 72695f03 authored Feb 12, 2013 by tbrehm
--- a/server/lib/classes/tpl_error.inc.php
+++ b/server/lib/classes/tpl_error.inc.php
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
--- a/server/server.php
+++ b/server/server.php