Bump version
Merge commit 'f504cb59eeb68d2b26a434e68b391922d0b6e185' into develop
Squashed 'core/' changes from 1e82ea4..c917697

c917697 Remove Connection->Config relation; not necessary right now.
f7e8509 Add Exceptions to TM.test*() for connection/SSL errors
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
ad3b65b WebDAV SSL without AppContext and with user truststore in userconfig, works
2bbf813 Merge branch 'develop' into feature/webdavssl2
e717d33 plugin purgefile on windows: more simple approach
bf58e6c Merge remote-tracking branch 'upstream/develop' into develop
a49af43 Implement log file rotation 4*25MB; relates to #116
7276594 Merge develop
f6107f3 Merge branch 'release/0.1.2-alpha' of github.com:binwiederhier/syncany into release/0.1.2-alpha
fc185a0 Merge develop
03a0812 Merge branch 'develop' of github.com:binwiederhier/syncany into develop
6499045 Code prettification
9343f3b Update CHANGELOG.md
fa47631 Rename global config to user config, write demo config file, closes #109
417564f Add system properties configuration possibility in GlobalConfig. Relates to #109
5e7ed49 Immediately sync again if local or remote notification received; don't swallow notifications; fixes #88
6c9ab3e Merge branch 'master' of https://github.com/vadimpanin/syncany into develop
407e9a0 WebDAV SSL without ApplicationContext
282db67 Merge branch 'develop' into feature/webdavssl
ef0f27c Update README.md
53c11e7 Update CHANGELOG.md
999ded1 Pick random machine name; fixes #114
af4d66c Merge develop
27379a6 Plugin not supported stack trace issue fixed. Fixes #111
8b2d077 Fixing ApplicationContext tests
8e1a461 Cont'd webdav ssl
a2079de Adding contributors link
ade5ea3 Introduce ApplicationContext fully
2fd3a10 Cont'd WebDAV SSL; introducing ApplicationContext to resolve null-dependencies on Config
8cbfe2b Merge branch 'develop' into feature/webdavssl
6c7e76c Update CHANGELOG.md
55aae9f Added plugin compatibility check. Closes #104
3e343bc Merge Vadim's wildcard ignore changes
32cb98e Merge branch 'wildcardsToRegexps' of https://github.com/vadimpanin/syncany into develop
a894ae2 fix and test for ? mark in wildcards
4051a76 styling and test for ignoring files using wildcards
af0d0ce JavaDoc for new TransferManager interface
5fdf342 autoconverting wildcards to regexps
add2848 WebDAV SSL branch merged; Feature development now split to here and https://github.com/syncany/syncany-plugin-webdav
50a0261 Merge develope
97360d6 Merge branch 'develop' into feature/webdavssl
bd01db5 Merge branch 'develop' into feature/webdavssl
7714536 Merge branch 'release/0.1.1-alpha'
9bd49b6 Merge branch 'develop' into feature/webdavssl
31110d5 Merge develop; fix merge conflicts
cc675d6 WebDAV SSL cont'd; fix exception
7c26366 WebDAV SSL prettify; still major overhead; not sure if good; still no truststore persistence after initial 'init' or 'connect'
d5acc4b Cont'd WebDAV SSL; stores in trust store, uses trust store; not working: store after init/connect (config not there yet)
1d3bf32 Webdav SSL cont'd; truststore initialization works, but no way to store it without having initialized the local dir
e47e365 Continue CLI listener for plugins, very ugly design
2eb1bae Webdav SSL stuff (WIP, does not compile)
d1562d0 Merge branch 'release/0.1.0-alpha'

git-subtree-dir: core
git-subtree-split: c91769702e690f29cc31cf9035cdbb264625cf9c
New plugin interface
Merge commit '0794485ae87f943574edc5e778124a59594fb9e6' into develop
Squashed 'core/' changes from c917697..e0645a9

e0645a9 Merge feature/userinteraction; closes #127
ef25f7c Merge branch 'feature/userinteraction' into develop
833f4c4 Add newline before password
b582bdd User interaction cont'd; centralized interaction at AbstractInitCommand and UserInteractionListener
4a903ae Update CHANGELOG.md
8689597 Extended user interaction for plugins; beginning (works)

git-subtree-dir: core
git-subtree-split: e0645a9a9f31dd05c87f4c049ea5bc1e145d11c3
Fixes syncany/syncany#128
Merge commit '7cb814a2f432930d118a52aee88683f464ca4052' into develop
Squashed 'core/' changes from e0645a9..8f78e55

8f78e55 Deactivate removeLostMultiChunks() as workaround for #132
2659fbd Merge branch 'develop' of github.com:syncany/syncany into develop
09de91e Remove order or cleanup (workaround for #58)
4a2cbfe Update CHANGELOG.md
a4154a2 Changelog update
9d98b7c Merge branch 'develop' of github.com:syncany/syncany into develop
563bcbb Merge branch 'feature/actions' into develop
6952704 Delete temp action files
ae8274b Documentation
4a0a5ae Update CHANGELOG.md
f009c72 Implements deletion of old ActionRemoteFiles of other clients after 8 minutes; relates to #64
7eec496 Implements action renewal every 2 minutes
5733ef0 Move operations to their own packages
a5278e3 Test for actions; relates to #64
54a9f23 Add working removeLostMultiChunks() to CleanupOperation; not sure about the semantics of cleanup though
1b2090a First attempt to delete unused remote multichunks; not working
7ffb398 Move CleanupOperation to its own package.
daf2fa2 Introducing the ActionRemoteFile to prevent cleanup during up/down; works for local plugin; relates to #64

git-subtree-dir: core
git-subtree-split: 8f78e555d2e4d93c826c4449a6337aa624324045
Merge 0.1.3-alpha; Bump version; adjust action files
Squashed 'core/' changes from 8f78e55..568bbe4

568bbe4 Correct changelog release date

git-subtree-dir: core
git-subtree-split: 568bbe4135706f22b03001b579d8f8f3b0cbbedb
Merge commit 'a853d58be28fb8d00176a8fe96b580a3fadb7898' into develop
Squashed 'core/' changes from 568bbe4..ca1916c

ca1916c Merge branch 'release/0.1.3-alpha'
ebc7ae7 Merge branch 'release/0.1.2-alpha'

git-subtree-dir: core
git-subtree-split: ca1916c1ce2cdbf6a4266991759a1a0968a47171
Merge commit '52cca67e3f3d0119e466c5a9513adde78151278e' into develop
Merge branch 'release/plugin-s3/v0.1.3-alpha'