Merge branch 'master' into HEAD
authorW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 17:02:51 +0000 (10:02 -0700)
committerW. Trevor King <wking@tremily.us>
Thu, 24 Oct 2013 17:02:51 +0000 (10:02 -0700)
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


Trivial merge