From: W. Trevor King <wking@tremily.us>
Date: Wed, 30 Oct 2013 04:07:01 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02862d7ff3d08366baac526e532ac2f1210760f0;p=swc-workshop.git

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/
---

02862d7ff3d08366baac526e532ac2f1210760f0