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

Merge branch 'master' into namespaced

This is a no-op merge, explicitly considering and rejecting the
de-namespacing 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:
  get-my-ip.py: Remove nesting setup/
---

ebc33366f1e0bcf1fa32f296eafb995d2aab6d4e