simpler
Merge branch 'master' of github.com:wbsoft/frescobaldi