Merge branch 'master' into multi_app_dir

Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index f0bfc064cb5..f2a5775fd19 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -156,4 +156,13 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 		return $files;
 	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 * @param int $time
+	 * @return bool
+	 */
+	public function hasUpdated($path,$time){
+		return $this->filemtime($path)>$time;
+	}
 }