From: W. Trevor King <wking@tremily.us>
Date: Wed, 23 Oct 2013 20:07:33 +0000 (-0700)
Subject: Merge remote tracking branch 'version-control-svn/namespaced' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c244280a09b920ebb879aa2abd4b80b2280a90cd;p=swc-workshop.git

Merge remote tracking branch 'version-control-svn/namespaced' into namespaced

This is a no-op merge, explicitly considering and rejecting the
removal of subject-level documents from this subject-level branch.
After this merge, folks can merge both version-control/namespaced and
version-control-svn/namespaced branches without conflicts.

* version-control-svn/namespaced:
  version-control: Remove subject-level documents from this SVN branch
---

c244280a09b920ebb879aa2abd4b80b2280a90cd