Merge branch 'master' of git://git.tails.boum.org/tails
commit171816153ea102561edbf4d7fbd508f4dcb28ca3
authorTails developers <amnesia@boum.org>
Tue, 19 Aug 2014 06:36:43 +0000 (19 06:36 +0000)
committerTails developers <amnesia@boum.org>
Tue, 19 Aug 2014 06:36:43 +0000 (19 06:36 +0000)
tree482625925ade72102c29c5fa060fa86c98d31f1a
parent47ff7e956ed1d88dca4e04b821212cf1ea2a0bbc
parent066b5f79724666eb97a2d0a938f9b1af930a768e
Merge branch 'master' of git://git.tails.boum.org/tails