Merge branch 'master' of git.rot13.org:/git/BackupPC