Merge branch 'it-xhtml' of git+ssh://repo.or.cz/srv/git/msmp into patisserie