Merge branch 'master' of git.greptilian.com:/var/lib/git/wiki
authorPhilip Durbin <philipdurbin@gmail.com>
Wed, 11 Jul 2012 20:10:03 +0000 (16:10 -0400)
committerPhilip Durbin <philipdurbin@gmail.com>
Wed, 11 Jul 2012 20:10:03 +0000 (16:10 -0400)

Trivial merge