Merge branch 'master' into bc-namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:57 +0000 (14:24 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:57 +0000 (14:24 -0700)
commit597e99ef16dcc4bd1f7c71e50f1a23582a1075a6
treebea1ffb58e3832417833e11116894001416cc05a
parent655bea2ba031613e0be17e2e66db72e647f1aafe
parent3f293fcf8b91dc2fd4ac1a0348d78bdb71f67559
Merge branch 'master' into bc-namespaced

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