luci-0.9: merge r5015

diff --git a/modules/freifunk/htdocs/luci-static/flashing.html b/modules/freifunk/htdocs/luci-static/flashing.html
index f2de57507a43a38b91c52f933dc712c217ef9d3e..43e51236d7bd00d60265ca7508b234b36367ab9a 100644 (file)
--- a/modules/freifunk/htdocs/luci-static/flashing.html
+++ b/modules/freifunk/htdocs/luci-static/flashing.html
@@ -40,7 +40,7 @@
        </style>
 
        <script type="text/javascript"><!--
-               var time_remaining = 60 * 20;
+               var time_remaining = 60 * 25;
                var interval = window.setInterval(function() {
                        if( time_remaining <= 0 )
                        {
@@ -71,7 +71,7 @@
                <h2>Performing Upgrade</h2>
 
                <p>
-                       The System is flashing now. The procedure can take up to 20 minutes,
+                       The System is flashing now. The procedure can take up to 25 minutes,
                        please be patient and wait until this page reloads itself.
 
                        <br /><img src="resources/flashing.gif" style="vertical-align:middle; margin:10px" />