Merge remote-tracking branch 'origin/cleanup/shellcheck' into cleanup/shellcheck

# Conflicts:
#	automated install/basic-install.sh
This commit is contained in:
Dan Schaper 2017-01-09 00:17:15 -08:00
commit cbe045b946
No known key found for this signature in database
GPG key ID: 572E999E385B7BFC

Diff content is not available