Merge branch 'devel' into feature/i2p-0.9.8.1lizard/feature/i2p-0.9.8.1
commit18ff60425e6ae1c1de4776cc5ea38e35f3e098a4
authorTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 10:41:40 +0000 (30 10:41 +0000)
committerTails developers <amnesia@boum.org>
Sat, 30 Nov 2013 10:41:40 +0000 (30 10:41 +0000)
tree0735d6162c76e2cb02aabc7186b73302205741c9
parent238d766e3193ca229da0c6647cc007ea60248c7c
parente34f8a47879bb2ae8584694013c6c00702e17533
Merge branch 'devel' into feature/i2p-0.9.8.1
config/chroot_local-includes/etc/ferm/ferm.conf
config/chroot_local-includes/etc/iceweasel/profile/foxyproxy.xml
config/chroot_local-packageslists/tails-common.list