Merge branch 'jonathanchu-master'

Author: nvie

git/repo/base.py

@@ -682,10 +682,9 @@ def blame_incremental(self, rev, file, **kwargs):
         data = self.git.blame(rev, '--', file, p=True, incremental=True, stdout_as_string=False, **kwargs)
         commits = dict()
 
-        stream = iter(data.splitlines())
+        stream = (line for line in data.split(b'\n') if line)
         while True:
             line = next(stream)  # when exhausted, casues a StopIteration, terminating this function
-
             hexsha, orig_lineno, lineno, num_lines = line.split()
             lineno = int(lineno)
             num_lines = int(num_lines)

git/test/fixtures/blame_incremental

@@ -7,7 +7,7 @@ committer Sebastian Thiel
 committer-mail <[email protected]>
 committer-time 1270634931
 committer-tz +0200
-summary Used this release for a first beta of the 0.2 branch of development
+summary Used this release for a first beta of the 0.2 branch of development
 previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS
 filename AUTHORS
 82b8902e033430000481eb355733cd7065342037 14 14 1