Merge git://repo.or.cz/git-gui

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 3832f602253fbe793ddf81c61b61e5a2757ce89d..342529db309821f461e8f77d05bc5e01c76802ec 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1142,7 +1142,7 @@ class P4Sync(Command):
 
         s = ''
         for (key, val) in self.users.items():
-            s += "%s\t%s\n" % (key, val)
+           s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
 
         open(self.getUserCacheFilename(), "wb").write(s)
         self.userMapFromPerforceServer = True