Merge branch 'master' into 'master'

Marius Cramer

2014-05-19 9b4702d833708415d0cf05a98a00aac1bc850ff7

 interface/web/login/lib/module.conf.php

@@ -1,6 +1,6 @@
<?php

$module["name"]       = "login";

$module["title"]       = "Login";

$module["template"]    = "module.tpl.htm";

$module["startpage"]    = "login/index.php";

?>
<?php
$module["name"]   = "login";
$module["title"]   = "top_menu_login";
$module["template"]  = "module.tpl.htm";
$module["startpage"]  = "login/index.php";
?>