Merge branch '5322-sso-manual-account-doc' closes #5322
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 3 Mar 2015 17:16:55 +0000 (12:16 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 3 Mar 2015 17:16:55 +0000 (12:16 -0500)

Trivial merge