Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:50 +0000 (14:24 -0700)
committerW. Trevor King <wking@tremily.us>
Mon, 21 Apr 2014 21:24:50 +0000 (14:24 -0700)
* master:
  README.md: Convert 'boot camp' -> 'workshop'

1  2 
setup/installation-test/README.md

Simple merge