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

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

This is a no-op merge, explicitly considering and rejecting the
SVN-specific removal from the subject-level master branch.  This
avoids merge conflicts if an aggregation branch wants to merge both
our namespaced branch and the subject-level namespaced branch.

* version-control/namespaced:
  version-control/svn: Remove SVN-specific content
---

6815d9f2a704c6f59e1080c720c26e51392eb810