Merge branch 'bugfix/8038-remove-useless-iceweasel-apt-pinning' into testing
commit14e060c351f382da927b7fc7e5f80aa0e0980fe6
authorTails developers <amnesia@boum.org>
Tue, 14 Oct 2014 10:09:56 +0000 (14 12:09 +0200)
committerTails developers <amnesia@boum.org>
Tue, 14 Oct 2014 10:09:56 +0000 (14 12:09 +0200)
tree3a0781a21b3cced30f0add6f41fd5c9194f1ec6c
parent9cb6c623e44de1ff9f2af058e2ab606b97859f1a
parent3e3c40fb473fe1dd0f13fede1c66a54ca324d763
Merge branch 'bugfix/8038-remove-useless-iceweasel-apt-pinning' into testing