From: W. Trevor King <wking@tremily.us>
Date: Mon, 21 Apr 2014 21:24:57 +0000 (-0700)
Subject: Merge branch 'master' into bc-namespaced
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=597e99ef16dcc4bd1f7c71e50f1a23582a1075a6;p=swc-setup-installation-test.git

Merge branch 'master' into bc-namespaced

* master:
  README.md: Convert 'boot camp' -> 'workshop'
---

597e99ef16dcc4bd1f7c71e50f1a23582a1075a6