Merge branch 'master' of git://git.tails.boum.org/tails
commit08847b8d412a4204d1902eefd0c146bf52466048
authorTails developers <amnesia@boum.org>
Fri, 13 Feb 2015 17:56:44 +0000 (13 17:56 +0000)
committerTails developers <amnesia@boum.org>
Fri, 13 Feb 2015 17:56:44 +0000 (13 17:56 +0000)
tree8355f1862752be91d2c43220a2dd63fa1f3e38dd
parent15a17d94aa0702356bed86757f1d5c8d99ef3ad6
parent3b21f2b300a95677982586291cd37748c7989aa1
Merge branch 'master' of git://git.tails.boum.org/tails