From: W. Trevor King <wking@tremily.us>
Date: Sat, 18 Oct 2014 04:04:33 +0000 (-0700)
Subject: Merge branch 'namespaced' of git://tremily.us/swc-setup-installation-test into assembled
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5216ceb4f17f4e2d78493291f2b3a787ed6aeeca;p=swc-boot-camp.git

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'
---

5216ceb4f17f4e2d78493291f2b3a787ed6aeeca