From: W. Trevor King <wking@tremily.us>
Date: Tue, 29 Oct 2013 22:58:56 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dd37d4aa3fb69cf32fcab21eff18c053f3aff7c3;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.

  $ git merge --log --no-ff --strategy ours master

* master:
  dictionary.txt: Remove nesting 1-Shell/
---

dd37d4aa3fb69cf32fcab21eff18c053f3aff7c3