Merge branch 'master' of github.com:xurxof/xmarks2html