Merge branch '6676-document-sso' refs #6676
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 31 Jul 2015 14:31:46 +0000 (10:31 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 31 Jul 2015 14:32:06 +0000 (10:32 -0400)

Trivial merge