Merge branch 'devel' into feature/wheezyjenkins-build_Tails_ISO_feature-wheezy-36jenkins-build_Tails_ISO_feature-wheezy-37jenkins-build_Tails_ISO_feature-wheezy-38jenkins-build_Tails_ISO_feature-wheezy-39jenkins-build_Tails_ISO_feature-wheezy-40jenkins-build_Tails_ISO_feature-wheezy-41jenkins-build_Tails_ISO_feature-wheezy-42jenkins-build_Tails_ISO_feature-wheezy-43jenkins-build_Tails_ISO_feature-wheezy-44jenkins-build_Tails_ISO_feature-wheezy-45jenkins-build_Tails_ISO_feature-wheezy-46jenkins-build_Tails_ISO_feature-wheezy-47jenkins-build_Tails_ISO_feature-wheezy-48jenkins-build_Tails_ISO_feature-wheezy-49jenkins-build_Tails_ISO_feature-wheezy-50jenkins-build_Tails_ISO_feature-wheezy-51jenkins-build_Tails_ISO_feature-wheezy-52jenkins-build_Tails_ISO_feature-wheezy-53jenkins-build_Tails_ISO_feature-wheezy-54jenkins-build_Tails_ISO_feature-wheezy-58jenkins-build_Tails_ISO_feature-wheezy-59jenkins-build_Tails_ISO_feature-wheezy-60jenkins-build_Tails_ISO_feature-wheezy-61
commit2e843bbfe6e157e84d0b057d1f712ee0ee1de285
authorTails developers <amnesia@boum.org>
Thu, 15 Aug 2013 19:05:32 +0000 (15 19:05 +0000)
committerTails developers <amnesia@boum.org>
Thu, 15 Aug 2013 19:05:35 +0000 (15 21:05 +0200)
treee787a62a15234fe59d0a2d9a901d8cdad42b0602
parent72e480b6394c07e2f43531540cd5ac3ddf2d179c
parentbfbdc2756157c71b0e0265ce00414679f7b2953a
Merge branch 'devel' into feature/wheezy
auto/config
config/chroot_apt/preferences