From: W. Trevor King <wking@tremily.us>
Date: Thu, 24 Oct 2013 19:44:27 +0000 (-0700)
Subject: Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hello into assembled
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70ffe3dbc5a0e69dc3ba293ec647a1ad56898d5d;p=swc-workshop.git

Merge branch 'namespaced' of git://tremily.us/swc-modular-shell-hello into assembled

Avoid problems due to the shared history of swc-modular-shell and
swc-modular-shell-hello by restoring the subject-level files removed
in swc-modular-shell-hello:

  $ git checkout HEAD -- modular/shell/{README.md,cheat-sheet.md,instructor.md}

Conflicts:
	modular/shell/instructor.md
---

70ffe3dbc5a0e69dc3ba293ec647a1ad56898d5d