Merge branch 'feature/torbrowser' into experimentaljenkins-build_Tails_ISO_experimental-11
commit6c44e5031e245163539837c7d93d7fcb12eb6b6e
authorTails developers <amnesia@boum.org>
Wed, 17 Apr 2013 05:11:30 +0000 (17 07:11 +0200)
committerTails developers <amnesia@boum.org>
Wed, 17 Apr 2013 05:11:30 +0000 (17 07:11 +0200)
tree1756d12ee1db5a45fd4fabaa3725700fd436160d
parent47cf56c6a05760240b7e02616b32322c43bf3821
parentecb80db8080ed20c91682f06adfbefd3f816b6c8
Merge branch 'feature/torbrowser' into experimental