Merge branch 'master' of github.com:roundcube/roundcubemail

Aleksander Machniak

2013-09-20 b334a01791689a16c8d6b10955df850b891ff40e

 program/lib/Roundcube/rcube_config.php

@@ -214,7 +214,7 @@
                    $success = true;
                }
                // deprecated name of config variable
                else if (is_array($rcmail_config)) {
                if (is_array($rcmail_config)) {
                    $this->merge($rcmail_config);
                    $success = true;
                }