Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index c869bb88643d67a7954db026ce9ebb50c0f89be0..c80a6da2522b690e15f84fedf52a132078cd265a 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -1141,7 +1141,7 @@ class P4Sync(Command):
 
         l = p4CmdList("labels %s..." % ' '.join (self.depotPaths))
         if len(l) > 0 and not self.silent:
-            print "Finding files belonging to labels in %s" % `self.depotPath`
+            print "Finding files belonging to labels in %s" % `self.depotPaths`
 
         for output in l:
             label = output["label"]