Merge branch 'devel' into testing
commit66cafbcf72cf3d6782282d37afe0de5972f20498
authorTails developers <amnesia@boum.org>
Wed, 8 Oct 2014 20:17:37 +0000 (8 22:17 +0200)
committerTails developers <amnesia@boum.org>
Wed, 8 Oct 2014 20:17:37 +0000 (8 22:17 +0200)
treec19cda43cfeeaa12c3aa9afaa78a88b1ee8cf88d
parent7fd7c245b54d5929b62731ee6c0b5ee15dc44f6a
parent7e7ef209fdfa8b871e5f21115d12aa68a69a4f7a
Merge branch 'devel' into testing