Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:49:35 +0000 (14:49 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 22 May 2012 02:49:35 +0000 (14:49 +1200)

Trivial merge