Conflicts:
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js

Conflicts:
	config/chroot_apt/preferences
	config/chroot_local-includes/etc/iceweasel/pref/000-tor-browser.js
	config/chroot_local-includes/etc/iceweasel/profile/adblockplus/patterns.ini
	debian/changelog
	po/ar.po
	po/cy.po
	po/da.po
	po/de.po
	po/el.po
	po/en_GB.po
	po/es.po
	po/fa.po
	po/fr.po
	po/fr_CA.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/lv.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ru.po
	po/sk.po
	po/sv.po
	po/tails.pot
	po/tr.po
	po/uk.po
	po/zh.po
	po/zh_CN.po
	wiki/src/doc/about.index.pt.po
	wiki/src/doc/about/features.pt.po
	wiki/src/doc/about/requirements.pt.po
	wiki/src/doc/advanced_topics/cold_boot_attacks.pt.po
	wiki/src/doc/anonymous_internet.index.pt.po
	wiki/src/doc/anonymous_internet/vidalia.fr.po
	wiki/src/doc/encryption_and_privacy.index.pt.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.de.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.fr.po
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.mdwn
	wiki/src/doc/first_steps/introduction_to_gnome_and_the_tails_desktop.pt.po
	wiki/src/doc/first_steps/persistence/warnings.pt.po
	wiki/src/doc/get.index.pt.po
	wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po
	wiki/src/support.de.po
	wiki/src/support/known_issues.de.po
	wiki/src/support/known_issues.fr.po
	wiki/src/support/known_issues.pt.po
	wiki/src/support/talk.pt.po

Conflicts:
	wiki/src/support/known_issues.fr.po

We very well know it doesn't work in many cases. We have a ticket tracking it.

Depending on something (Debian release being used?) it gets quoted, or not.

Conflicts:
	wiki/src/press.mdwn

That's the last known-good state of 451f/de/docsummary