Merge branch '7330-improved-sso-package'
authorWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 18:03:52 +0000 (14:03 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 18:03:52 +0000 (14:03 -0400)
closes #7330


Trivial merge