Merge branch '2.0'

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 274735b05c30376a3cda3b08f4fba9e33a95ed32,783f4e65a2b98a681debf8d52097a2e1cf2c88a4..3ad7a3b49c5001aff9d1a5d9270715b66cd0c4e1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,6 +1,12 @@@
  ChangeLog
  =========
- version 2.0.2 (release 2015-10-22)
 +version 2.1 (release 2015-yy-zz)
 + * We removed the old libneon-based propagator.
 +   It was already disabled on OS X and Windows and only used on
 +   Linux when building with Qt < 5.4 and having bandwidth limiting enabled.
 +   So now you need Qt 5.4 on Linux if you want bandwidth limiting.
 +
+ version 2.0.2 (release 2015-10-21)
    * csync_file_stat_s: Save a bit of memory
    * Shibboleth: Add our base user agent to WebKit
    * SelectiveSync: Increase folder list timeout to 60