Merge branch 'feature/linux-3.10-1' into stablejenkins-build_Tails_ISO_stable-10jenkins-build_Tails_ISO_stable-11jenkins-build_Tails_ISO_stable-12jenkins-build_Tails_ISO_stable-13jenkins-build_Tails_ISO_stable-14jenkins-build_Tails_ISO_stable-15jenkins-build_Tails_ISO_stable-16jenkins-build_Tails_ISO_stable-17jenkins-build_Tails_ISO_stable-18jenkins-build_Tails_ISO_stable-19jenkins-build_Tails_ISO_stable-21jenkins-build_Tails_ISO_stable-22jenkins-build_Tails_ISO_stable-8jenkins-build_Tails_ISO_stable-9
commitf5c180e0149502764cbd8ed27304887bc85b911f
authorTails developers <amnesia@boum.org>
Thu, 25 Jul 2013 15:03:00 +0000 (25 17:03 +0200)
committerTails developers <amnesia@boum.org>
Thu, 25 Jul 2013 15:03:00 +0000 (25 17:03 +0200)
tree45f269b3124a48530671076df4b8dcc43cf38efa
parent7a69e0349260cb0824f9e7e8e52fc29dd3fd6c28
parent44ae1b9fd7d14c1f3fb63fa4478214f213dbfdd1
Merge branch 'feature/linux-3.10-1' into stable