Merge branch 'feature/jenkins-compatible-build-script' into experimentaljenkins-fetch_Tails_Git-3
commit354111945b0e8d5deacf5e49486d025825fbe111
authorTails developers <amnesia@boum.org>
Thu, 11 Apr 2013 18:02:53 +0000 (11 20:02 +0200)
committerTails developers <amnesia@boum.org>
Thu, 11 Apr 2013 18:02:53 +0000 (11 20:02 +0200)
tree3acd4a8a3ad148622b5efc3c857ea55a22aeabda
parentcd2d498857f661e17a9a9649bc2751b5de793594
parentdf65af7ba55f07de6e6d2d97809db52e1ac7bf16
Merge branch 'feature/jenkins-compatible-build-script' into experimental