Merge branch 'master' into 6676-document-sso
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 28 Jul 2015 17:15:22 +0000 (13:15 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 28 Jul 2015 17:15:22 +0000 (13:15 -0400)
commit5ac198c8fd7e329b08f344843fa5680add07566c
treee43fc7f4b7549c42ccf2cd58cf9c5f37e0872dd4
parent607c3ded2ab3ad0c04ef2e3520ce1b507774dedb
parent004bafda085386b50e074eedf370ec40a386d6e5
Merge branch 'master' into 6676-document-sso

Conflicts:
doc/install/install-sso.html.textile.liquid
doc/install/install-sso.html.textile.liquid