From: W. Trevor King <wking@tremily.us>
Date: Wed, 23 Oct 2013 19:29:56 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7e11c3be615ee9aa41f3b501bcfd1998f864340d;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.

* master:
  installation-test: Add a submodule with my installation test scripts
  windows-installer: Add a submodule with Ethan's Windows installer
  get-my-ip: Add a submodule with my IP detection script
---

7e11c3be615ee9aa41f3b501bcfd1998f864340d