Merge branch 'master' of github.com:owncloud/core into vcategories_db

Conflicts:
	lib/vcategories.php

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index b88bb232c36..3b038b3fda9 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -63,13 +63,13 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	public function unlink($path) {
 		return $this->storage->unlink($path);
 	}
-	public function fopen($path,$mode) {
-		return $this->storage->fopen($path,$mode);
+	public function fopen($path, $mode) {
+		return $this->storage->fopen($path, $mode);
 	}
 	public function free_space($path) {
 		return $this->storage->free_space($path);
 	}
 	public function touch($path, $mtime=null) {
-		return $this->storage->touch($path,$mtime);
+		return $this->storage->touch($path, $mtime);
 	}
 }
\ No newline at end of file