Merge remote-tracking branch 'origin/master' into chunking-ng
authorOlivier Goffart <ogoffart@woboq.com>
Mon, 31 Oct 2016 10:09:12 +0000 (11:09 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Mon, 31 Oct 2016 10:09:12 +0000 (11:09 +0100)
commit8ca3eb788333322141bd1606b93ce5335eecf86e
tree6c49f354532925ce569949282625744a6fe3de8b
parente33b89c222b164ec9b1146476fc018ab34194ecc
parent5f47c01346b839b60b88350ef8f031177c49f620
Merge remote-tracking branch 'origin/master' into chunking-ng
src/libsync/account.cpp
src/libsync/account.h
src/libsync/networkjobs.cpp