Merge branch 'feature/Debian-proposed-updates' into stable

d83b233b · Tails developers · b216f4fc · 9e3c762b · d83b233b · b216f4fc
Commit d83b233b authored Oct 20, 2014 by Tails developers
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -231,10 +231,6 @@ Package: *
 Pin: release o=Debian,n=wheezy-updates
 Pin-Priority: 990

-Package: *
-Pin: release o=Debian,n=wheezy-proposed-updates
-Pin-Priority: 990
-
 Package: *
 Pin: release o=Debian,n=wheezy
 Pin-Priority: 990

--- a/config/chroot_sources/wheezy-proposed-updates.binary
+++ b/config/chroot_sources/wheezy-proposed-updates.binary
-wheezy-proposed-updates.chroot
\ No newline at end of file
--- a/config/chroot_sources/wheezy-proposed-updates.chroot
+++ b/config/chroot_sources/wheezy-proposed-updates.chroot
-deb http://ftp.us.debian.org/debian/ wheezy-proposed-updates main contrib non-free