Merge branch 'master' into namespaced
authorW. Trevor King <wking@tremily.us>
Wed, 30 Oct 2013 04:07:01 +0000 (21:07 -0700)
committerW. Trevor King <wking@tremily.us>
Wed, 30 Oct 2013 04:07:01 +0000 (21:07 -0700)
This is a no-op merge, explicitly considering and rejecting the
de-namespacing from the master branch.  After this merge, future
merges from the master branch will pick up any content changes.

* master:
  README.md: Remove nesting shell/exercises/


Trivial merge