Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:37:48 +0000 (10:37 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 25 May 2012 02:37:48 +0000 (10:37 +0800)

Trivial merge