Merge branch 'master' into 7330-improved-sso-package
authorWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 17:50:44 +0000 (13:50 -0400)
committerWard Vandewege <ward@curoverse.com>
Tue, 29 Sep 2015 17:50:44 +0000 (13:50 -0400)
commit3a4b7ec9daecbff438c83380c6beccaf88d9e47c
treed25c39ec00dacbf7d6158ea31bb3b6e4f6e16acc
parentf3f86fcf67775df91937392dd74a527dcbcf1886
parentf235c17c253d9ece933c972039e4872ef7157533
Merge branch 'master' into 7330-improved-sso-package

refs #7330