Merge branch '8' into psgi

Conflicts: lib/WebGUI/Asset/Template.pm lib/WebGUI/Session/Scratch.pm
2010-04-21 13:03:03 -05:00 · 2010-04-21 13:03:03 -05:00 · cb3f83a93e
commit cb3f83a93e
parent 814f6e3182 beb2f2cf59
45 changed files with 987 additions and 860 deletions
--- a/lib/WebGUI/Asset/Template.pm
+++ b/lib/WebGUI/Asset/Template.pm
@ -85,6 +85,7 @@ sub _build_templatePacked {
        do_javascript       => 'shrink',
        do_stylesheet       => 'minify',
    } );
+    $template;
 }

 property usePacked => (