Conflicts:
	config/chroot_apt/preferences
	config/chroot_local-hooks/10-install_backported_xorg
	config/chroot_local-hooks/10-install_iceweasel_localization
	config/chroot_local-hooks/16-i2p_config
	config/chroot_local-hooks/50-virtualbox
	config/chroot_local-packages/liveusb-creator_3.11.6-2_all.deb
	config/chroot_local-packageslists/tails-common.list