~ salmonella-environment-setup (master) d43182a37c4836f6a3efbc1a4cf00b97b8290d7e

commit d43182a37c4836f6a3efbc1a4cf00b97b8290d7e
Merge: 386bd0d c687038
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sat May 26 12:51:52 2018 +0200
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sat May 26 12:58:33 2018 +0200

    Merge setup-salmonella-environment into this one
    
    setup-salmonella-environment was previously at
    https://github.com/mario-goulart/setup-salmonella-environment
    
    Files in that repository have been moved to the system-setup
    directory.

diff --cc system-setup/debian-jessie.sh
index 0000000,3aee34f..3aee34f
mode 000000,100755..100755
--- a/system-setup/debian-jessie.sh
+++ b/system-setup/debian-jessie.sh
diff --cc system-setup/debian-stretch.sh
index 0000000,505d550..505d550
mode 000000,100755..100755
--- a/system-setup/debian-stretch.sh
+++ b/system-setup/debian-stretch.sh
diff --cc system-setup/debian-wheezy.sh
index 0000000,f5545a7..f5545a7
mode 000000,100755..100755
--- a/system-setup/debian-wheezy.sh
+++ b/system-setup/debian-wheezy.sh
diff --cc system-setup/freebsd.sh
index 0000000,6c9b124..6c9b124
mode 000000,100755..100755
--- a/system-setup/freebsd.sh
+++ b/system-setup/freebsd.sh