Merge branch 'master' of vcs.fsf.org:libreplanet-static