Merge branch 'devel' of ssh://webmasters.boum.org/~/wiki into devel

7e2e5f50 · Tails developers · 66dbe6aa · bab5fa25 · 7e2e5f50
Commit 7e2e5f50 authored Jun 06, 2012 by Tails developers
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -94,6 +94,10 @@ Package: msva-perl
 Pin: origin backports.debian.org
 Pin-Priority: 999

+Package: python-pdfrw
+Pin: origin backports.debian.org
+Pin-Priority: 999
+
 Package: plymouth
 Pin: release o=Debian,a=unstable
 Pin-Priority: 999