Merge branch 'bugfix/back-to-linux-3.10' into testing
commitfec54247a0bf8558f94d3603c9ec4aff95ebaad7
authorTails developers <amnesia@boum.org>
Thu, 5 Dec 2013 14:33:23 +0000 (5 15:33 +0100)
committerTails developers <amnesia@boum.org>
Thu, 5 Dec 2013 14:33:23 +0000 (5 15:33 +0100)
tree7f70f2cc402acb0869a887376a5b39e56b6277dd
parent9de7a70cd1f73e7858f7206008917b1dbcddaf43
parent7a996f55023a5b35088c0c78c0fa328c5844e65c
Merge branch 'bugfix/back-to-linux-3.10' into testing