Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:48 +0000 (10:27 -0800)
committerW. Trevor King <wking@tremily.us>
Mon, 9 Nov 2015 18:27:48 +0000 (10:27 -0800)
* master:
  swc-installation-test-2.py: Disable sympy, Cython, networkx, and mayavi.mlab
  swc-installation-test-2.py: Comment explaining implemention

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

Simple merge