Merge commit 'f1b5f858eb4a52c7407f8111492cec32c07bb6c3' into feature/webdavssl2
Squashed 'core/' changes from ad3b65b..84b59ad

84b59ad Fix after merge
4366fcc Merge branch 'develop' into feature/webdavssl2
b65780d Fix ugly icon in Windows setup
ba1d85d Merge branch 'develop' into feature/webdavssl2
7c4eca2 Windows RTF documents update
4b60d0f Windows RTF documents update
4cf71eb Give option to set JAVA_HOME in Inno Setup installer
196da57 Include 'sy' and 'sy.bat' as actual scripts; easier for zip/tar.gz/exe
f13b479 Increase max. memory to 2GB; does not solve, but relates to #115
d7fa3ed Merge branch 'develop' of github.com:syncany/syncany into develop
9e9eef5 New links in Windows installation RTF documents
af8e41b Change description of Windows PATH variable checkbox
8d3407c Merge pull request #122 from syncany/feature/javahomewin
f2bce19 Set JAVA_HOME during installation on Windows #121
d6c9832 Merge branch 'develop' of github.com:syncany/syncany into develop
4f99b79 Fix paths after GitHub move
719218f Merge remote-tracking branch 'upstream/develop' into develop
50be39f Adding plugin-jars to startup script for arch
baa3c63 Bump version
be19ac4 Merge branch 'develop' into feature/webdavssl2
af6033d Edit/add help texts
98bc55f Force commit to trigger Travis
c6c816b Merge branch 'develop' into release/0.1.2-alpha
51caad0 Merge Vadmin's bugfixes; fixes #118, closes #120
4ac8548 Merge branch 'fileHandleLeak' of https://github.com/vadimpanin/syncany into develop
7a79b45 Merge branch 'develop' into release/0.1.2-alpha
afbd7d6 file handle leak fix (#118)
8f00bb6 Fix broken log test
e987c28 Update CHANGELOG.md
2bf221e Update CHANGELOG.md
94a7f62 Fix Windows plugin JAR deletion; fixes #113, fixes #117
d5dff96 plugin purgefile on windows: batch commands moved to gradlew generator
e717d33 plugin purgefile on windows: more simple approach
bf58e6c Merge remote-tracking branch 'upstream/develop' into develop
7276594 Merge develop
f6107f3 Merge branch 'release/0.1.2-alpha' of github.com:binwiederhier/syncany into release/0.1.2-alpha
6c9ab3e Merge branch 'master' of https://github.com/vadimpanin/syncany into develop
ef0f27c Update README.md
7714536 Merge branch 'release/0.1.1-alpha'
d1562d0 Merge branch 'release/0.1.0-alpha'

git-subtree-dir: core
git-subtree-split: 84b59ad47e17317da2e5abe08dad347a78e216c7
Allow 'no' answer for 'do you trust question'
Squashed 'core/' changes from 84b59ad..f7e8509

f7e8509 Add Exceptions to TM.test*() for connection/SSL errors

git-subtree-dir: core
git-subtree-split: f7e8509d56188f04de3c2c2f618327e8bebf9cba
Merge commit 'bae2a5a7294f438e3c8f526be47f7303c101804c' into feature/webdavssl2