Remove duplicate APT pinning entry, likely introduced by wrongly resolving a merge conflict.
Update website PO files, else there's no way translators can do their job...
Update link to the troubleshooting documentation (Closes: #6892).
Merge branch 'testing' into devel
Add dummy entry for next release.
Add a non-regression test.
Merge branch 'testing' into feature/wheezy
Import Tor Launcher standalone generated from commit 47e9ec0.
Install Linux 3.12 from deb.tails.boum.org.

Linux 3.13.5-1 migrated to testing, and we are in feature freeze for
Tails 0.23, so the relevant packages have been imported to our APT
repo.
Merge branch 'feature/linux-3.12' into testing
Merge branch 'testing' into devel
Merge branch 'testing' into bugfix/6885-tor-launcher-localisation
Add dummy changelog entry for next release.
Merge branch 'testing' into bugfix/6885-tor-launcher-localisation
Import Tor Launcher standalone generated from commit a94a6d7.
Merge remote-tracking branch 'origin/bugfix/6885-tor-launcher-localisation' into bugfix/6885-tor-launcher-localisation
Merge branch 'testing' into devel

Conflicts:
	debian/changelog
Merge branch 'devel' into feature/wheezy

Conflicts:
	config/chroot_apt/preferences