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)
commit2ae65fa7d614a3d060663e2ebbab1df4c6df0ac0
treeeab0567759b83a16d4ca1d67345e384c5643b9a7
parent1fc169e5aee0782925bb2bfbbd193af9fd2c3f83
parent3f293fcf8b91dc2fd4ac1a0348d78bdb71f67559
Merge branch 'master' into namespaced

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