Merge branch 'master' of git.tails.boum.org:frithjof/tails
commitb3aaae53661e04b93ccb796ef48ca8718ddb75eb
authorTails developers <amnesia@boum.org>
Tue, 7 Jan 2014 23:21:11 +0000 (8 00:21 +0100)
committerTails developers <amnesia@boum.org>
Tue, 7 Jan 2014 23:21:11 +0000 (8 00:21 +0100)
tree6bba50efee7b276f03e811bfe6ebbe5ae7b614d7
parentf0190f0cedaf2cf765c90d4b2e0b1a6396636c61
parente5d0adf8a95df6f584e4d4548a2af1868e9a5ad1
Merge branch 'master' of git.tails.boum.org:frithjof/tails