Merge remote-tracking branch 'refs/remotes/spaetz/fix_docs'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 4 Sep 2013 12:41:56 +0000 (07:41 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 4 Sep 2013 12:41:56 +0000 (07:41 -0500)

Trivial merge