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)
commite6b637c1c8778f6aeffa04ae48b5c56cc959c2e1
treea7c9279a6ff740882dbd62ceae3bac6994889171
parent597e99ef16dcc4bd1f7c71e50f1a23582a1075a6
parentcbfbc0f72872b9db5cede8c0879d14bbf27afd36
Merge branch 'master' into bc-namespaced

* master:
  swc-installation-test-2.py: Bump minimum IPython version to 1.0
setup/swc-installation-test-2.py