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

Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing and submodule addition from the master branch.  After
this merge, future merges from the master branch will pick up any
content changes.  Until the next submodule addition anyway, then we'll
need another no-op merge to reject that.

* master:
  svn: Add a submodule with my Subversion notes
  git: Add a submodule with my Git notes
  README.md: Remove nesting version-control/
---

ba4720c063fd1501fb00b5a85c547063b3912418