Merge branch 'master' of git://git.tails.boum.org/tails
commit8f4ff16cba73ebbf7a47ac8e46007a03b4ebe926
authorTails developers <amnesia@boum.org>
Sun, 15 Feb 2015 13:06:34 +0000 (15 13:06 +0000)
committerTails developers <amnesia@boum.org>
Sun, 15 Feb 2015 13:06:34 +0000 (15 13:06 +0000)
tree6354a8729d8cf8ea3a29d0d37048381233f50e3d
parent08847b8d412a4204d1902eefd0c146bf52466048
parentaf065e18bed0271bf5298558a2c1a080d6ddf0f1
Merge branch 'master' of git://git.tails.boum.org/tails