progit is available in several languages
Merge branch 'testing' into devel
merge conflicts
Merge branch 'master' into web/donation
simplifying and adding info for receipt
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Add dummy changelog entry.
Install syslinux-efi: since syslinux 3:6.03~pre1+dfsg-2, that's where the EFI bootloader lives.
Adapt syslinux EFI bootloader path to cope with changes in the Debian package.
Merge branch 'master' of git://git.tails.boum.org/tails
adding another Tails media appearance
Merge branch 'master' of https://git-tails.immerda.ch/tails
resolve faulty merge
Merge branch 'master' into web/donation
Merge remote-tracking branch 'origin/master' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel

Conflicts:
	debian/changelog
Merge branch 'devel' into feature/monkeysign
Merge branch 'master' of https://git-tails.immerda.ch/tails