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)
commitf0a417c6daab17835bee1dd32e617054800947a9
tree6ad28726a29b177d8a834b889d57e60ee9d45706
parenta4b69c3ddce5929bd6a72b4a1483f481ebe46d54
parent6ea8efab86981e990d58c70256a277a6a80e0384
Merge branch 'master' into namespaced

* master:
  instructor.md: Update hello path with deeper hello/hello nesting
modular/shell/instructor.md