From: W. Trevor King <wking@tremily.us>
Date: Thu, 24 Oct 2013 15:47:07 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4b69c3ddce5929bd6a72b4a1483f481ebe46d54;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:
  exercises/hello: Add the hello script example submodule
---

a4b69c3ddce5929bd6a72b4a1483f481ebe46d54