Merge branch 'master' into desymlink

Conflicts:
	Annex/CatFile.hs
	Annex/Content.hs
	Git/LsFiles.hs
	Git/LsTree.hs

1 files changed, 5 insertions, 5 deletions

diff --git a/Annex/CatFile.hs b/Annex/CatFile.hs
index cde9d5170..161554f29 100644
--- a/Annex/CatFile.hs
+++ b/Annex/CatFile.hs
@@ -38,11 +38,11 @@ catObjectDetails ref = do
 
 catFileHandle :: Annex Git.CatFile.CatFileHandle
 catFileHandle = maybe startup return =<< Annex.getState Annex.catfilehandle
-	where
-		startup = do
-			h <- inRepo Git.CatFile.catFileStart
-			Annex.changeState $ \s -> s { Annex.catfilehandle = Just h }
-			return h
+  where
+	startup = do
+		h <- inRepo Git.CatFile.catFileStart
+		Annex.changeState $ \s -> s { Annex.catfilehandle = Just h }
+		return h
 
 {- From the Sha of a symlink back to the key. -}
 catKey :: Sha -> Annex (Maybe Key)