Merge branch 'bugfix/7345-upgrade-from-iso-from-1.0-to-1.1' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Add dummy changelog entry.
Merge remote-tracking branch 'origin/master' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel

Conflicts:
	debian/changelog
Merge branch 'master' of git://git.tails.boum.org/tails
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel
Merge branch 'testing' into devel

Conflicts:
	debian/changelog
Merge branch 'master' into devel