From: W. Trevor King <wking@tremily.us>
Date: Thu, 24 Oct 2013 02:42:08 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1181ded838105cdafd3ec44d9c39629f4659f7aa;p=swc-workshop.git

Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
submodules 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:
  shell: Add a submodule with POSIX shell examples
---

1181ded838105cdafd3ec44d9c39629f4659f7aa