src/mirall/generalsettings.cpp | 10 0 + 10 - 0 !
src/mirall/mirallconfigfile.cpp | 7 5 + 2 - 0 !
2 files changed, 5 insertions(+), 12 deletions(-)

 disable phoning-home version check

OWNCLOUD.cmake | 2 2 + 0 - 0 !
config.h.in | 5 5 + 0 - 0 !
src/mirall/owncloudtheme.cpp | 6 3 + 3 - 0 !
3 files changed, 10 insertions(+), 3 deletions(-)

 added a version tag to label this version as a debian build

test/testfolderwatcher.h | 12 12 + 0 - 0 !
1 file changed, 12 insertions(+)

 skips failing tests for bsd
 Some tests fails on BSD, so we skip them in hope of the application still works.

src/mirall/syncjournaldb.cpp | 51 51 + 0 - 0 !
src/mirall/syncjournaldb.h | 1 1 + 0 - 0 !
2 files changed, 52 insertions(+)

 1.7.0~beta1 correction patch
 1.7.0~beta1 enters unstable, so we have to take care about,
 that we downgrade the database again to the state of 1.6.

src/mirall/account.cpp | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 nicer fix for the security issue #3283.

(cherry picked from commit 89376e14d6135a6f39a6df99d54fde253573575c)

src/mirall/account.cpp | 5 5 + 0 - 0 !
1 file changed, 5 insertions(+)

 abort the request and reset the qnam if user does not ack a new cert.

This is supposed to fix bug #3283

(cherry picked from commit 75b38d1a2ffe57d0f1eb3ebb8c5f30b8b2a185e4)

src/mirall/account.cpp | 15 15 + 0 - 0 !
src/mirall/account.h | 1 1 + 0 - 0 !
2 files changed, 16 insertions(+)

 windows: reset qnam as a workaround. #2899 #2895 #2973

The QNetworkAccessManager is reset when we are disconnected, just
before attempting to fetch the server's status.php.

This may help fix the problem described in various issues where we
get 'Connection closed' or timeout errors after the OS has woken
from sleep.

(cherry-picked from 57c14a0ebab56c322fe2b42e33e557cc42a70781)