Merge remote-tracking branch 'kytv/feature/i2p-disable-bob' into stable
commit4885e6d013986e0ad8759f0b9a8309b5a19ddcce
authorTails developers <amnesia@boum.org>
Thu, 7 Aug 2014 09:34:09 +0000 (7 09:34 +0000)
committerTails developers <amnesia@boum.org>
Thu, 7 Aug 2014 09:34:09 +0000 (7 09:34 +0000)
tree69c2830235eed60b1f0ce97cab30263d5806c13a
parent554c3c33d84f4d74f7b886e1c8330f979596de4f
parent6d6d4f4bf9f32a36d41181e051abb799709ca530
Merge remote-tracking branch 'kytv/feature/i2p-disable-bob' into stable