Merge remote-tracking branch 'origin/feature/jenkins-compatible-build-script' into... jenkins-build_Tails_ISO_stable-4
commit3879727cb46d113cd7ed2c5aad3f9c6f96f33140
authorTails developers <amnesia@boum.org>
Mon, 29 Apr 2013 17:58:57 +0000 (29 19:58 +0200)
committerTails developers <amnesia@boum.org>
Mon, 29 Apr 2013 17:58:57 +0000 (29 19:58 +0200)
treed8fd30950b16dd3fa9a61b8ba2f7c5c59b64bf88
parent821c04e725d47bd962c77032557b3e7bf4a5e65e
parentdf9bd03fef0e112ec83851d062de51257c5cb494
Merge remote-tracking branch 'origin/feature/jenkins-compatible-build-script' into stable