From: W. Trevor King <wking@tremily.us>
Date: Thu, 31 Oct 2013 15:38:47 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5eb69373bbedaf6cd19875acd330123c1bae797b;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:
  generate_data.py: Remove nesting shellExample/
---

5eb69373bbedaf6cd19875acd330123c1bae797b