Merge branch 'master' of sept.info9.net:wiki
authorTom Marble <tmarble@info9.net>
Mon, 5 Jan 2015 18:21:03 +0000 (12:21 -0600)
committerTom Marble <tmarble@info9.net>
Mon, 5 Jan 2015 18:21:03 +0000 (12:21 -0600)

Trivial merge