Merge branch 'master' of git://git.tails.boum.org/tails
commit2f25ec2db614046d7358d373752e55da5516f28c
authorTails developers <amnesia@boum.org>
Fri, 16 Jan 2015 18:56:57 +0000 (16 18:56 +0000)
committerTails developers <amnesia@boum.org>
Fri, 16 Jan 2015 18:56:57 +0000 (16 18:56 +0000)
tree6f904df9d66b91ceab7f852517dec3739c30396c
parent29e027b6d3ebbb1a9590dd1a224f08ed2953bb82
parent76eb79cff71875710742d3f3549fc107c3dc6b1f
Merge branch 'master' of git://git.tails.boum.org/tails