Merge branch '6438-multiplatform-install-guide-wip'
authorBrett Smith <brett@curoverse.com>
Mon, 6 Jul 2015 21:37:21 +0000 (17:37 -0400)
committerBrett Smith <brett@curoverse.com>
Mon, 6 Jul 2015 21:37:46 +0000 (17:37 -0400)
Closes #6438, #6455.  Refs #6388.


Trivial merge