Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 03:18:18 +0000 (20:18 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 03:18:18 +0000 (20:18 -0700)
* master:
  swc-installation-test-2.py: Bump minimum IPython version to 1.0

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

Simple merge