Merge remote-tracking branch 'flapflap/de-fingerprint'
commitcab9b4c9c70fa1b025bf766a7129b4e2a0c370ee
authorTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:34:19 +0000 (24 08:34 +0000)
committerTails developers <amnesia@boum.org>
Tue, 24 Feb 2015 08:34:19 +0000 (24 08:34 +0000)
tree9b10cc5dd011847cf119e38a1853509d49b5fe26
parentec979b9d731702db19f36b8f4d980ea0d86b92b2
parent120c8673e3a888b8aceb313e995eec8899159e68
Merge remote-tracking branch 'flapflap/de-fingerprint'