Merge remote-tracking branch 'origin/master' into compose_focus

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

 program/lib/Roundcube/rcube_imap_generic.php

@@ -1063,7 +1063,7 @@
     */
    public function connected()
    {
        return ($this->fp && $this->logged) ? true : false;
        return $this->fp && $this->logged;
    }

    /**