Merge remote-tracking branch 'origin/2.3'

 Conflicts:
	src/libsync/owncloudpropagator.h

diff --cc src/libsync/owncloudpropagator.h
index d1812e23cc2a9c07945aae2b2248bd88d388ae44,0e7be74d71cabdb3e643ed63bfbecb30f6a463e1..0cb949e39b843552ef650662c72e364681ae7f9d
--- 1/src/libsync/owncloudpropagator.h
--- 2/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@@ -272,9 -257,7 +272,6 @@@ public
  
  class OwncloudPropagator : public QObject {
      Q_OBJECT
- 
-     QScopedPointer<PropagateDirectory> _rootJob;
- 
 -    PropagateItemJob *createJob(const SyncFileItemPtr& item);
  public:
      const QString _localDir; // absolute path to the local directory. ends with '/'
      const QString _remoteFolder; // remote folder, ends with '/'