Merge branch '3232-user-guide-updates' closes #3232
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 4 Aug 2014 21:02:48 +0000 (17:02 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 4 Aug 2014 21:02:48 +0000 (17:02 -0400)

Trivial merge