Merge branch 'devel' into feature/wheezyjenkins-build_Tails_ISO_feature-wheezy-8
commit0755c88325fd84be8db5341c91d149c550038e83
authorTails developers <amnesia@boum.org>
Sun, 28 Jul 2013 12:57:57 +0000 (28 14:57 +0200)
committerTails developers <amnesia@boum.org>
Sun, 28 Jul 2013 12:57:57 +0000 (28 14:57 +0200)
treef8f59e2f1be1f6aae48d0db0b9f1f9ad75087346
parentef5fde4657d74fd9f409ced1cbbabc8054afa207
parent3ad3eab77a9e9429a1f9c837efe04446be2e954f
Merge branch 'devel' into feature/wheezy