Enable AppArmor LSM.
Install the AppArmor userspace tools from Debian unstable.
Add AppArmor profile for Vidalia.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Add AppArmor profile for Tor.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Add AppArmor profile for Evince.

The idea is to test it in this branch so that we can get it included into
Debian soon.
Merge branch 'devel' into feature/apparmor

Conflicts:
	config/amnesia
	config/chroot_apt/preferences
Merge branch 'feature/wheezy' into feature/apparmor

Conflicts:
	config/chroot_local-packageslists/tails-common.list
Don't ship an AppArmor profile for Tor, the Debian package does.

This reverts commit 87b78ac92c14c707e3d058de696d710010af0e9d.
Add AppArmor alias from / to /lib/live/mount/rootfs/filesystem.squashfs/.

This is supposedly needed to take advantage of John Johansen's aliaspatch.
Update Vidalia's AppArmor profile to what's in Debian.
Merge branch 'feature/wheezy' into feature/apparmor

Conflicts:
	wiki/src/doc/first_steps/accessibility.fr.po
Ship an empty /etc/apparmor.d/local/usr.bin.vidalia that the usr.bin.vidalia profile depends on.
Activate highlight misspelled words by default in Pidgin
Install Monkeysign dependencies for qrcodes scanning.
Merge branch 'devel' into feature/monkeysign
Disable TCP timestamps (Closes: #6579).
passing through POedit
passing thru poedit
Tails 1.1 translation
Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into devel