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

Kyle Francis

2016-04-02 65225262f6bb524b93feb49178509cada3390ee3

 program/lib/Roundcube/rcube_contacts.php

@@ -707,7 +707,7 @@
            $this->result = null;  // clear current result (from get_record())
        }

        return $updated ? true : false;
        return !empty($updated);
    }

    /**