Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 15:50:07 +0000 (08:50 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 17:02:01 +0000 (10:02 -0700)
* master:
  instructor.md: Update hello path with deeper hello/hello nesting

1  2 
modular/shell/instructor.md

Simple merge