Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --cc update_daemon2.php
index 51fe8cfec29df8ff63b1448696f61d51cb04492c,f841954cbd7a6115a58f5fd95513a68cc6f4190e..30787e6ab2494c2440d79cd6fc6857a8ce4036ed
--- 1/update_daemon2.php
--- 2/update_daemon2.php
+++ b/update_daemon2.php
@@@ -15,10 -15,9 +15,9 @@@
  
        // defaults
        define_default('PURGE_INTERVAL', 3600); // seconds
 -      define_default('MAX_CHILD_RUNTIME', 600); // seconds
 +      define_default('MAX_CHILD_RUNTIME', 1800); // seconds
        define_default('MAX_JOBS', 2);
        define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
-       define_default('DAEMON_FEED_LIMIT', 250);
  
        require_once "rssfuncs.php";
        require_once "sanity_check.php";