Merge remote-tracking branch 'origin/master' into stable
commit81272add64309447484253c5e9e8a1af43f869e7
authorTails developers <amnesia@boum.org>
Wed, 24 Sep 2014 06:07:19 +0000 (24 06:07 +0000)
committerTails developers <amnesia@boum.org>
Wed, 24 Sep 2014 06:07:19 +0000 (24 06:07 +0000)
tree4c432fc0663befe3f22f13ef87c65068a0c535bd
parent86e6a74b0b0bbd987659d67937231c456549cb8e
parent6c4c1bb3b51269eb22057f3cdbe3e2e9455365a9
Merge remote-tracking branch 'origin/master' into stable