Merge remote-tracking branch 'origin/bugfix/safer-persistence' into testing
commit7ebf1a7e54190102c9ee16478716de6cb37d3173
authorTails developers <amnesia@boum.org>
Sat, 26 Oct 2013 19:15:46 +0000 (26 19:15 +0000)
committerTails developers <amnesia@boum.org>
Sat, 26 Oct 2013 19:15:46 +0000 (26 19:15 +0000)
tree26399d8dcda9ab08a8383e6756990b594d6efb99
parent9c6d47bbdd1b5c6fad765afebf4c794e63a2b4f9
parenteee849f942f99ce4e7686aa6d9fe2539026351d9
Merge remote-tracking branch 'origin/bugfix/safer-persistence' into testing