Merge branch 'devel' into security/vidalia_in_its_own_user
commit1cc70607918bdcbc883312298f10e58b7ceb56f2
authorTails developers <amnesia@boum.org>
Tue, 1 Oct 2013 14:20:32 +0000 (1 14:20 +0000)
committerTails developers <amnesia@boum.org>
Tue, 1 Oct 2013 14:20:32 +0000 (1 14:20 +0000)
tree9f58f83caf339c713977f32e653366750d33251c
parent6bdac741dfbc7d6862008aa6ec78eaf6b42309ea
parentf3629996261f39d759b1644db997e145b29019e1
Merge branch 'devel' into security/vidalia_in_its_own_user