From: W. Trevor King <wking@tremily.us>
Date: Wed, 23 Oct 2013 19:38:43 +0000 (-0700)
Subject: Merge branch 'master' into assembled
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8f3a72e6c74eeef8e76ec953f1c47ea38d74816c;p=swc-boot-camp.git

Merge branch 'master' into assembled

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:
  setup: Add a submodule with student-setup utilities
  version-control: Add a submodule with my subject-level notes
---

8f3a72e6c74eeef8e76ec953f1c47ea38d74816c