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)
commit100625f6c2aca37ac4276e686277a1b6568bc893
treed699ceb95cc8641e718327b7dd6da4af44fbfa52
parentb6fc7dd96e3241b98e07cfcd2cd02a162d8bd704
parentcc0c6cd25088f68a12aa0e1f048873d64b166d59
Merge remote-tracking branch 'refs/remotes/spaetz/fix_docs'