Merge remote-tracking branch 'origin/devel' into devel
commitcc11e147e0a79c212b0649fca00ed163c6893a02
authorTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:18 +0000 (17 00:09 +0000)
committerTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:18 +0000 (17 00:09 +0000)
treecdf1f67497d3b2f2769b3718a88ae5945a1f35f7
parentdca9e5996ebb89676527c47132d2549863742883
parentc968986aad5e425c2832591538872b036743d4e1
Merge remote-tracking branch 'origin/devel' into devel