Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 03:18:07 +0000 (20:18 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 03:18:07 +0000 (20:18 -0700)
commitb4d7ea131f5118ad66b3aba2a296a20742eebc25
tree37ecba7aade2bb004f541689520fc80b20a7e2bd
parent2ae65fa7d614a3d060663e2ebbab1df4c6df0ac0
parentcbfbc0f72872b9db5cede8c0879d14bbf27afd36
Merge branch 'master' into namespaced

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