Merge branch 'master' into release-2.0

Author: johndoh

config.inc.php.dist

@@ -39,7 +39,7 @@ $config['sieverules_usetls'] = FALSE;
 $config['sieverules_folder_delimiter'] = null;
 
 // Sieve RFC says that we should use UTF-8 encoding for mailbox names,
-// but some implementations does not covert UTF-8 to modified UTF-7.
+// but some implementations do not covert UTF-8 to modified UTF-7.
 // set to null for default behaviour
 $config['sieverules_folder_encoding'] = null;