Merged revisions 3536-3555 from 3.0.5 stable branch.

tbrehm

2012-10-16 a008884b8f041577d43675f13c492f45fb9ee066

 server/lib/classes/system.inc.php

@@ -1152,7 +1152,7 @@
   function make_trashscan(){
      global $app;
        //trashscan erstellen
        // Template Öffnen
        // Template Öffnen
        $app->tpl->clear_all();
        $app->tpl->define( array(table    => 'trashscan.master'));