Update release date in changelog
Bump version
Bump PKGBUILD
Different approach to resolving issue #227
Fix both #227 tests
Adding a multiple resolve issue test and fixing it
Adding issue227 test to ScenarioTestSuite
Merge branch 'develop' into bugfix/issue227-2
Update CHANGELOG.md
Add a few more events for ls-remote and plugin
Merge branch 'develop' of github.com:syncany/syncany into develop
Make 'sy daemon stop' more reliable on Windows, fixes #230
Merge branch 'feature/simplegui' of https://github.com/vwiencek/syncany into feature/simplegui
Make HTTP Basic Auth with WebSocket over SSL work; wow, how complex is that?
Nicer send message
Update AUTHORS.md
Rewriting exit to not exit, but return
Change switch from --no-daemon to --add-daemon, fixes #242
Merge pull request #241 from syncany/bugfix/exitcode

Rewriting exit to not exit, but return
Merge branch 'develop' into feature/simplegui