Merge commit 'refs/merge-requests/1108' of git://gitorious.org/git-python/mainline into integration

Author: serverhorror

lib/git/tree.py

@@ -45,7 +45,7 @@ def content_from_string(repo, text):
             ``git.Blob`` or ``git.Tree``
         """
         try:
-            mode, typ, id, name = text.expandtabs(1).split(" ", 4)
+            mode, typ, id, name = text.expandtabs(1).split(" ", 3)
         except:
             return None