Merge branch 'keep-alive'

Aleksander Machniak

2012-11-15 8d54286df87e21673c05f091e38ca4de14aae326

 installer/rcube_install.php

@@ -342,9 +342,6 @@
      }
    }

    if ($current['keep_alive'] && $current['session_lifetime'] < $current['keep_alive'])
      $current['session_lifetime'] = max(10, ceil($current['keep_alive'] / 60) * 2);

    $this->config  = array_merge($this->config, $current);

    foreach ((array)$current['ldap_public'] as $key => $values) {