Bump version
Add menu file (for proper menu triggering) to debian package
Update setup-gui.iss.skel
Merge commit '11b10260c7f3d77791b6d11d65e7475a19ff2ded' into develop
Squashed 'core/' changes from 3431027..f675175

f675175 Fix test
1bd43c7 Update changelog
dfd4e86 Filter ignored events
d8fbdcf A bit of JavaDoc-ing
ef20747 Using jpathwatch to monitor Windows file trees without locking directories, works great, relates to #248
85892ad Attempt to resolve issue #248, does not fix this issue though.
2be4f37 Fix log message for cleanup
760a4e6 Fix Linux man page handling on 'sy --help'
8bc4f5c For Darwin / Mac OS X: Add -XstartOnFirstThread to JRE options
6c7af17 For Darwin / Mac OS X: Add -XstartOnFirstThread to JRE options
19975f4 add Mac OS X SWT special VM arg
dde514d Bump version
1723829 Release date

git-subtree-dir: core
git-subtree-split: f675175c3f3d82b863a421fa952fbe02668123a2
Merge branch 'develop' of github.com:syncany/syncany-plugin-gui into develop
Surround launcher argument with quotes
Merge commit '5303093239b3eafbcb4a89e04100551d3ae10a12' into develop
Squashed 'core/' changes from f675175..5d613bd

5d613bd If --log not given, log to user log dir by default, relates to #258
b01560f Add log for GUI command
afc784b Update CHANGELOG.md
d2f672c Merge branch 'bugfix/issue247' into develop
6cac3dd Fixes issue #247 and #252; yeyy; Is this too dirty?
ca29cc4 Reproduce issue #247 (cause is #252); yeyy

git-subtree-dir: core
git-subtree-split: 5d613bd60fd9333aa6b359ff92fe0399604d0164
Fix for the use new log stuff
A bit of JavaDoc
Re-adding Vincent's Wizard code; needs lots of refactoring, but works
Squashed 'core/' changes from 5d613bd..f4f6ae9

f4f6ae9 Update CHANGELOG.md
9077f32 Merge branch 'develop' of github.com:syncany/syncany into develop
8d09794 Allows user and global plugins to coexist, with user-plugin having precendence; relates to #259
71f0368 Update CHANGELOG.md
4de8018 Update CHANGELOG.md

git-subtree-dir: core
git-subtree-split: f4f6ae98521983ed8e705064cabceb3625aa1e5b
Merge commit '840c3181b7877f33fba3dba432709543e552e548' into develop
Cont'd Wizard development
Cont'd wizard
Prepare for new develop subtree pull
Merge commit 'c8e777312f91f80c70a9105b918001e65f26bec9' into feature/wizard
Squashed 'core/' changes from 5d613bd..4b53e59

4b53e59 Add new ManagementRequests and move DaemonHelper to lib package
9077f32 Merge branch 'develop' of github.com:syncany/syncany into develop
8d09794 Allows user and global plugins to coexist, with user-plugin having precendence; relates to #259
71f0368 Update CHANGELOG.md
4de8018 Update CHANGELOG.md

git-subtree-dir: core
git-subtree-split: 4b53e594786d158bffdee94217f59c140f2a2189
Merge commit '68f8d62a57df27e19f138b3c91a3bcd77f0c01bc' into feature/wizard