Merge branch '6939-package-sso-server'
authorWard Vandewege <ward@curoverse.com>
Tue, 1 Sep 2015 20:57:06 +0000 (16:57 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 1 Sep 2015 20:57:06 +0000 (16:57 -0400)
closes #6939


Trivial merge