Merge remote-tracking branch 'origin/test/7760-i2p-toggled-via-boot-parameter' into...
commitb1a4ca90ddaf1c51541ded0f2fbfee31432c0ef2
authorTails developers <amnesia@boum.org>
Tue, 26 Aug 2014 12:14:53 +0000 (26 14:14 +0200)
committerTails developers <amnesia@boum.org>
Tue, 26 Aug 2014 12:14:53 +0000 (26 14:14 +0200)
tree1f29c63e4cb764170e40dee9de8d62121772bca9
parente300a5bdbf73a52723a1485b8b213811dc1c6355
parent84ec24b673fa47ec513e1646cb7b9309faf046c2
Merge remote-tracking branch 'origin/test/7760-i2p-toggled-via-boot-parameter' into stable