From: W. Trevor King <wking@tremily.us>
Date: Tue, 11 Mar 2014 17:37:07 +0000 (-0700)
Subject: Merge branch 'master' into bc-namespaced
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fbc-namespaced;p=swc-sql.git

Merge branch 'master' into bc-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:
  *.ipynb: Use absolute URLs to link to the glossary
  index.md: Remove YAML front-matter
  Remove novice/sql namespace
---

77a591d5a0b490baa74b252399f46e8d6b567ad2