Merge branch 'master' of http://git.tine20.org/git/Syncope