Merge branch 'master' into fixing-4011-master

Conflicts:
	lib/connector/sabre/directory.php
	lib/connector/sabre/file.php

1 files changed, 1 insertions, 1 deletions

diff --git a/cron.php b/cron.php
index d39800c8849..8e1a3376d53 100644
--- a/cron.php
+++ b/cron.php
@@ -79,7 +79,7 @@ try {
 
 		// We call ownCloud from the CLI (aka cron)
 		if ($appmode != 'cron') {
-			// Use cron in feature!
+			// Use cron in future!
 			OC_BackgroundJob::setExecutionType('cron');
 		}