Merge branch 'MDL-45118-shibboleth-login-warning' of https://github.com/mpetrowi...
authorSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:15:55 +0000 (09:15 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 21 Apr 2014 21:15:55 +0000 (09:15 +1200)

Trivial merge