Merge branch 'w51_MDL-37302_m25_roleedit' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 22:58:17 +0000 (11:58 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Jan 2013 22:58:17 +0000 (11:58 +1300)

Trivial merge