Merge branch 'w12_MDL-32045_m23_resetnorole' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 23:06:07 +0000 (12:06 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Mar 2012 23:06:07 +0000 (12:06 +1300)

Trivial merge