Merge branch 'MDL-20365_auth_db_salted_passwords' of https://github.com/MorrisR2...
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 19:19:04 +0000 (08:19 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Nov 2014 19:19:04 +0000 (08:19 +1300)

Trivial merge