Merge branch 'stable' into develdevel
commit868fedde39b33723a30aff4ac8ff0176be3e7237
authorTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:47 +0000 (17 00:09 +0000)
committerTails developers <amnesia@boum.org>
Sun, 17 Aug 2014 00:09:47 +0000 (17 00:09 +0000)
tree87a94d8491d5a06dd073f620e519afbb25b6d2a5
parentcc11e147e0a79c212b0649fca00ed163c6893a02
parent3c96bfb706897afc1d10a11750dcac0f9639930c
Merge branch 'stable' into devel