Merge remote-tracking branch 'origin/2.3'
authorChristian Kamm <mail@ckamm.de>
Wed, 17 May 2017 11:10:19 +0000 (13:10 +0200)
committerChristian Kamm <mail@ckamm.de>
Wed, 17 May 2017 11:10:19 +0000 (13:10 +0200)
commit5eaae83a01e3a622842d44f20e7614f96a281140
treed08f187a6416e4733f00cf27f40161ebaef61fad
parentc50136d675adcdb40f9f3eb097cca721cb5b73dc
parentc09a828f7b5c85233db558d60a3ef84b85bcd102
Merge remote-tracking branch 'origin/2.3'
csync/src/csync_statedb.c
doc/faq.rst
src/libsync/syncjournaldb.h
test/testsyncengine.cpp