Merge branch 'master' into bc-namespaced bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:49 +0000 (21:58 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 18 Jul 2016 04:58:49 +0000 (21:58 -0700)
* master:
  swc-installation-test-2.py: Prefer distro to platform.linux_distribution

1  2 
setup/swc-installation-test-2.py

Simple merge