Update upgrade-description files.
Updating trace file after uploading 1.1~beta1.
One more UEFI report.
Merge branch 'master' of ssh://webmasters.boum.org/~/wiki
Fix spacing issues in changelog.
Disable GNOME keyring's GnuPG functionality.

In feature/regular-gnupg-agent, we installed the regular GnuPG agent so that it
is used instead of GNOME keyring's one. This is not enough on Wheezy, so let's
disable the starting of the "gpg" component of GNOME keyring.
Merge remote-tracking branch 'origin/master' into stable
Remove dselect when purging other unwanted packages. (Closes: #7336)
Make sure /etc/default/locale exists, with a sensible default value (Closes: #7333).

Before Tails Greeter's PostLogin script our run, /etc/default/locale does not
exist on Wheezy. Our tails-kexec initscript (and quite a few other scripts we
run) depends on this file to exist. So, let's make sure it exists, with
a sensible default value.
Add dummy entry for next release.
Add Squeeze LTS source.

Squeeze will continue to get security updates from this suite after
its planned EOL date. For now we'll only install explicitly pinned
packages since the updates probably hasn't had the same level of QA as
normal security/stable updates.
Install GnuTLS from Squeeze LTS.

This fixes CVE-2014-3466.
Install openssl from Squeeze LTS.

This fixes CVE-2014-0076, CVE-2014-0195, CVE-2014-0221, CVE-2014-3470
and CVE-2014-0224.
Use ftp.us.debian.org for Squeeze-LTS too.

For consistency, and also because our initial tests showed that the
http.debian.net redirector doesn't work very well with Tor.
Merge branch 'feature/squeeze-lts-updates' into stable
Merge branch 'stable' into testing

Conflicts:
	config/chroot_apt/preferences
Revert feature/squeeze-lts-updates.
Merge remote-tracking branch 'origin/bugfix/7333-emergency-shutdown-before-login' into testing
Merge remote-tracking branch 'origin/bugfix/7330-disable-gnome-keyring-gpg-functionality' into testing
Merge remote-tracking branch 'origin/bugfix/7336-no-dselect' into testing