git subrepo pull uno

subrepo:
  subdir:   "uno"
  merged:   "cc757633"
upstream:
  origin:   "https://github.com/prrvchr/uno.git"
  branch:   "master"
  commit:   "cc757633"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

uno/.gitrepo

@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/prrvchr/uno.git
 	branch = master
-	commit = 9b32ecc1734832565ed39ee88978cbd90d75b7a0
+	commit = cc757633452c98b2639eb75d5ce8ac4857620807
 	method = merge
 	cmdver = 0.4.3
-	parent = 9495d9a8f74e8e218417dff79c862c3cfaadc67e
+	parent = 569deb02b5a5214571427d4fea1e142f4f874d6e

uno/lib/uno/ucb/replicator.py

@@ -185,7 +185,7 @@ def _pullUser(self, user):
                 return False
             self._logger.logprb(INFO, g_class, mtd, 201, user.Name)
             self._checkNewIdentifier(user)
-            pages, count, download, token = self._provider.pullUser(user)
+            count, download, pages, token = self._provider.pullUser(user)
             self._logger.logprb(INFO, g_class, mtd, 202, user.Name, count, download, pages, token)
             if token:
                 user.Token = token

uno/lib/uno/ucb/ucp/provider.py

@@ -157,7 +157,7 @@ def pullUser(self, user):
         for item in self.parseItems(user.Request, parameter, user.RootId):
             count += user.DataBase.mergeItem(user.Id, user.RootId, datetime, item)
             download += self.pullFileContent(user, item)
-        return parameter.PageCount, count, download, parameter.SyncToken
+        return count, download, parameter.PageCount, parameter.SyncToken
 
     # Method called by Content
     def updateFolderContent(self, user, data):