Merge branch 'feature/wheezy-security_APT_source' into testingjenkins-build_Tails_ISO_testing-9
commit483f5f6cd07f7ed15f79f2585e0d938cf2cb4b5f
authorTails developers <amnesia@boum.org>
Wed, 15 May 2013 21:58:19 +0000 (15 23:58 +0200)
committerTails developers <amnesia@boum.org>
Wed, 15 May 2013 21:58:19 +0000 (15 23:58 +0200)
treede8dbbae2915c657d46023d57b01d6ce56c219db
parent239162d736c49adb4ba0859991fb8d8a79d122d3
parent3f1212ee1c6eede41404f0d67739a434d8dadade
Merge branch 'feature/wheezy-security_APT_source' into testing