Merge remote-tracking branch '451f/spriver/news_v1.2'
commit81f38a17d61e3fe394fdc368645da039ffdf475e
authorTails developers <amnesia@boum.org>
Tue, 2 Dec 2014 06:57:34 +0000 (2 06:57 +0000)
committerTails developers <amnesia@boum.org>
Tue, 2 Dec 2014 06:57:34 +0000 (2 06:57 +0000)
tree6561e562d3a0547ce5a7a1ecd7f10e6c2e9088b2
parent34f8fac52b65fc2ff757e8c9870f7537e46f1464
parentc3ccba33b1af5e5ba381d9913b5217d2d406bb9b
Merge remote-tracking branch '451f/spriver/news_v1.2'