Merge branch 'feature/jenkins-compatible-build-script' into experimental
commitcd2d498857f661e17a9a9649bc2751b5de793594
authorTails developers <amnesia@boum.org>
Thu, 11 Apr 2013 17:59:11 +0000 (11 19:59 +0200)
committerTails developers <amnesia@boum.org>
Thu, 11 Apr 2013 17:59:11 +0000 (11 19:59 +0200)
tree5ab53e321e23cb4c69754ea4fb915dea7b194115
parent714e630db23c7d01aabc6822675d19dc8a62dfdb
parent8f5e4a854317588086bafae9d1d4bcd81605b1e3
Merge branch 'feature/jenkins-compatible-build-script' into experimental