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
Merge branch 'develop' into feature/issue192