Merge branch 'w51_MDL-30697_m23_roleslink' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:04:33 +0000 (10:04 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 19 Dec 2011 21:04:33 +0000 (10:04 +1300)

Trivial merge