Merge branch 'testing' into devel
commit53a96610330531503d06c4c37f9bcfd8f31d08b0
authorTails developers <amnesia@boum.org>
Wed, 23 Oct 2013 07:21:26 +0000 (23 07:21 +0000)
committerTails developers <amnesia@boum.org>
Wed, 23 Oct 2013 07:21:26 +0000 (23 07:21 +0000)
treed3d70d2ae89ca42a7cbf121821574b955ca688b6
parente29716e23485c249080a53c62813d6e776e47fda
parent4337c3d03d06eff7e65422fd633418fc2891f64e
Merge branch 'testing' into devel