# HG changeset patch
# User jbe
# Date 1427222043 -3600
# Node ID 3b00c08a6b90cd225759ce367f7d72cca2d0aad7
# Parent  93b32111526f2a077ab07467248f7b6bc47baf0f# Parent  fc9169c980d5143602215bdcff26b2773d95a10c
merge

diff -r 93b32111526f -r 3b00c08a6b90 app/main/_prefork/10_init.lua
diff -r 93b32111526f -r 3b00c08a6b90 config/devel.lua
--- a/config/devel.lua	Tue Mar 24 18:38:39 2015 +0100
+++ b/config/devel.lua	Tue Mar 24 19:34:03 2015 +0100
@@ -235,7 +235,7 @@
 
 config.free_timing = {
   calculate_func = function(policy, timing_string)
-    function interval_by_seconds(secs)
+    local function interval_by_seconds(secs)
       local secs_per_day = 60 * 60 * 24
       local days
       days = math.floor(secs / secs_per_day)
diff -r 93b32111526f -r 3b00c08a6b90 config/example.lua
--- a/config/example.lua	Tue Mar 24 18:38:39 2015 +0100
+++ b/config/example.lua	Tue Mar 24 19:34:03 2015 +0100
@@ -205,7 +205,7 @@
 
 config.free_timing = {
   calculate_func = function(policy, timing_string)
-    function interval_by_seconds(secs)
+    local function interval_by_seconds(secs)
       local secs_per_day = 60 * 60 * 24
       local days
       days = math.floor(secs / secs_per_day)