Merge branch 'nodbic' into newmc-nodbic

diff --cc Makefile.PL
index a1698a17c2b3b70366fc737fd16f8e10a86a4689,2584deb709b1f8c26b14fd9148c12931ae38026f..d83230927ebff8d03c23bdb53d2c66ab45b65932
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -14,9 -14,7 +14,8 @@@ WriteMakefile
        },
        BUILD_REQUIRES    => {
                qw/CSS::Minifier::XS          0
 +                 SVG::SpriteMaker           0
                   File::Slurp                0
-                  Test::MockTime             0
                   Test::More                 0
                   Test::WWW::Mechanize::PSGI 0/,
        },

diff --cc app.psgi
Simple merge

diff --cc lib/Plack/App/Gruntmaster/HTML.pm
Simple merge

diff --cc tmpl/pb_entry.en
Simple merge