Merge branch '4570-multi-auth-method' refs #4570
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 19:06:28 +0000 (14:06 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Jan 2015 19:06:46 +0000 (14:06 -0500)
commit8cf505f8205a2c8e0c121b76e3101f7eaa662516
treeb7d70aac3076bdeb4350c799f1ef59b57f790ec0
parent1a72b1b7b46d771129c1ec93221a5934fa33ef75
parentd63925110aaef11410ec7f975664727dfd4c0be8
Merge branch '4570-multi-auth-method' refs #4570