Merge branch 'feature/spaces-and-cleanup-0.3' into 0.3

* feature/spaces-and-cleanup-0.3:
  Minor modifications to get tests back to work. Two tests are failing in the latest git version, would have to dig into it
  Adjusted required versions of pre-requisites, now the majority of the tests work
  tabs to 4 spaces - this won't make integrating the patches easier, but it's probably a good idea to go a little more pep8 (and fix sins of my youth ;) )

1 files changed, 18 insertions, 18 deletions

diff --git a/git/objects/blob.py b/git/objects/blob.py
index f52d1a53..e96555c6 100644
--- a/git/objects/blob.py
+++ b/git/objects/blob.py
@@ -10,23 +10,23 @@ import base
 __all__ = ('Blob', )
 
 class Blob(base.IndexObject):
-	"""A Blob encapsulates a git blob object"""
-	DEFAULT_MIME_TYPE = "text/plain"
-	type = "blob"
-	
-	# valid blob modes
-	executable_mode = 0100755
-	file_mode = 0100644
-	link_mode = 0120000
+    """A Blob encapsulates a git blob object"""
+    DEFAULT_MIME_TYPE = "text/plain"
+    type = "blob"
+    
+    # valid blob modes
+    executable_mode = 0100755
+    file_mode = 0100644
+    link_mode = 0120000
 
-	__slots__ = tuple()
+    __slots__ = tuple()
 
-	@property
-	def mime_type(self):
-		"""
-		:return: String describing the mime type of this file (based on the filename)
-		:note: Defaults to 'text/plain' in case the actual file type is unknown. """
-		guesses = None
-		if self.path:
-			guesses = guess_type(self.path)
-		return guesses and guesses[0] or self.DEFAULT_MIME_TYPE
+    @property
+    def mime_type(self):
+        """
+        :return: String describing the mime type of this file (based on the filename)
+        :note: Defaults to 'text/plain' in case the actual file type is unknown. """
+        guesses = None
+        if self.path:
+            guesses = guess_type(self.path)
+        return guesses and guesses[0] or self.DEFAULT_MIME_TYPE