From: W. Trevor King <wking@tremily.us>
Date: Thu, 24 Oct 2013 17:02:51 +0000 (-0700)
Subject: Merge branch 'master' into HEAD
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0c8e8cd93a47386a09c69a0243bae0a2cbd635c;p=swc-boot-camp.git

Merge branch 'master' into HEAD

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:
  exercises/hearing: Add the cochlear implant example submodule
---

a0c8e8cd93a47386a09c69a0243bae0a2cbd635c