Add dummy changelog entry for Tails 1.2.1.
Revert "Enable Wheezy proposed-updates APT repository."

This reverts commit dc3952867939bdfb55eaa251a6b2fc97fa0b3418.

The proposed updates are now in Wheezy.
Revert "Setup APT pinning to install packages from stable-proposed-updates."

This reverts commit 2982197209a19e768a32454236fdd29afdd4be32.

The proposed updates are now in Wheezy.
Merge branch 'feature/Debian-proposed-updates' into stable
Merge branch 'feature/Debian-proposed-updates' into devel
Install syslinux-utils, to get isohybrid back (Closes: #8155).
Use the Tor Browser for MIME type that GNOME associates with Iceweasel (Closes: #8153).
Make tor-browser desktop file handle URL parameters.
Merge remote-tracking branch 'origin/bugfix/8155-get-isohybrid-back' into stable
Merge branch 'stable' into devel

Conflicts:
	debian/changelog
Set Torbutton logging preferences to the defaults (Closes: #8160).

With the default settings, no site-specific information is logged.
Use the correct stack of rootfs:s for the chroot browsers (Closes: #8152, #8152).

After installing incremental upgrades Tails' root filesystem consists
of a stack squashfs:s, not only filesystem.squashfs. When not stacking
them correct we may end up using the Tor Browser (Firefox) from an
older version of Tails, or with no Tor Browser at all, as in the
upgrade from Tails 1.1.2 to 1.2, when we migrated from Iceweasel to
the Tor Browser.

Based on patch contributed by sanic.
Merge remote-tracking branch 'origin/bugfix/8160-restrict-tor-browser-logging' into stable
Merge remote-tracking branch 'origin/bugfix/8160-restrict-tor-browser-logging' into devel
Merge remote-tracking branch 'origin/bugfix/8158-stacked-rootfs-vs-chroot-browsers' into stable
Merge branch 'stable' into devel
Merge remote-tracking branch 'origin/bugfix/8153-set-gnome-browser-mime-types' into stable
Merge branch 'stable' into devel
Update patch to include all Intel CPU microcodes (Closes: #8189).

First, make it actually apply on current /etc/default/intel-microcode.

Second, keep using IUCODE_TOOL_SCANCPUS=no, as we still want to include all
microcodes, not only the one(s) for the build machine's CPU.

Third, use forced early mode for IUCODE_TOOL_INITRAMFS:

  * We can't use non-early initramfs mode anymore, since support for it has
    been removed.
  * We could not use "early" mode with the previous version of the
    intel-microcode packaging, since it only supported building on Intel CPU.
  * Quoting debian/changelog: "early" mode now allows a "non-Intel box to
    generate an early initramfs with microcode for an Intel box", and "on auto
    mode, do nothing in a non-intel box. In forced "early" mode, attempt to run
    iucode-tool".

So, this introduces a change in behaviour, but that's the best supported one,
the most robust one, and the one we wanted to use previously but could not.
Merge branch 'devel' into feature/jessie

Conflicts:
	config/chroot_apt/preferences