Merge remote-tracking branch into 1.8

author Olivier Goffart <ogoffart@woboq.com>

Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)

committer Olivier Goffart <ogoffart@woboq.com>

Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)
author Olivier Goffart <ogoffart@woboq.com>
Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)
committer Olivier Goffart <ogoffart@woboq.com>
Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)
diff --cc src/libsync/account.cpp
Simple merge
diff --cc src/libsync/account.h
Simple merge
author	Olivier Goffart <ogoffart@woboq.com>
	Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)
committer	Olivier Goffart <ogoffart@woboq.com>
	Tue, 7 Apr 2015 06:02:55 +0000 (08:02 +0200)
		1	2
src/libsync/account.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsync/account.h	patch \|	diff1 \|	diff2 \|	blob \| history