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)
commit02862d7ff3d08366baac526e532ac2f1210760f0
treefe30e22708ab19cebe864dcccfa4707b2357c638
parentfb22f927c8394f9fa2dd19f974a18ed4f65d0fa6
parent4f63575228e8c46a7774969462edf0a7e0180995
Merge branch 'master' into namespaced

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/