From: W. Trevor King <wking@tremily.us>
Date: Thu, 31 Oct 2013 15:50:26 +0000 (-0700)
Subject: Merge branch 'master' into namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fnamespaced;p=swc-modular-shell.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.

  $ git merge --log --no-ff --strategy ours master

* master:
  exercises/hearing: Replace 2012-04-uchichicago commit with 2012-02-trieste
  exercises/genotype: Add the genotype example submodule
  exercises/dictionary: Add the dictionary example submodule
---

42501ab07eda294fa82a20f4425f8992e4d3c0a0