Merge branch 'namespaced' of git://tremily.us/swc-setup-installation-test into assembled assembled
authorW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 04:04:33 +0000 (21:04 -0700)
committerW. Trevor King <wking@tremily.us>
Sat, 18 Oct 2014 04:04:33 +0000 (21:04 -0700)
commit5216ceb4f17f4e2d78493291f2b3a787ed6aeeca
tree2633e98d899ca205b9801bcafa561d1f6e201427
parent26f69b4ddb334112fa4ca11111b724e8d1b4ce9a
parentb4d7ea131f5118ad66b3aba2a296a20742eebc25
Merge branch 'namespaced' of git://tremily.us/swc-setup-installation-test into assembled

* 'namespaced' of git://tremily.us/swc-setup-installation-test:
  swc-installation-test-2.py: Bump minimum IPython version to 1.0
  README.md: Convert 'boot camp' -> 'workshop'