Merge remote-tracking branch 'origin/master' into chunking-ng

diff --cc src/libsync/account.cpp
Simple merge

diff --cc src/libsync/account.h
index 62098b218a6a2720380397c724941270e3ad5cc2,4ff73748e64f720109c60e3fdb3b1210fd72ded8..36e606ebfb95bff5268d0dcf16d5a7e51b68228b
--- 1/src/libsync/account.h
--- 2/src/libsync/account.h
+++ b/src/libsync/account.h
@@@ -63,22 -66,8 +66,12 @@@ public
      static AccountPtr create();
      ~Account();
  
-     void setSharedThis(AccountPtr sharedThis);
      AccountPtr sharedFromThis();
  
 +    /// The user that can be used in dav url
 +    QString user() const;
 +    void setUser(const QString &user);
 +
      /// The name of the account as shown in the toolbar
      QString displayName() const;
  

diff --cc src/libsync/networkjobs.cpp
Simple merge