Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 05beae43cfeb15ea89b984d36105dcdbdffd0975

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

@@ -43,4 +43,6 @@
//                     'open'    => 1,
//                     'items'   => $items);



?>