Merge remote-tracking branch 'origin/feature/7886-linux-3.16' into devel
commit11be6e14e2c5c99862bc3a9429ad0ec39d4b42d9
authorTails developers <amnesia@boum.org>
Wed, 17 Sep 2014 10:24:09 +0000 (17 12:24 +0200)
committerTails developers <amnesia@boum.org>
Wed, 17 Sep 2014 10:24:09 +0000 (17 12:24 +0200)
treeabf4d3be86fa7921b8661e01e5e65869963ccac1
parentdc9d85fa89d1c456171b7bd366011557e3380edd
parente43aea9e8d701c7a440a7a1ebffaa0b769ceed8e
Merge remote-tracking branch 'origin/feature/7886-linux-3.16' into devel