Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 12:22:50 +0000 (13:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 12:22:50 +0000 (13:22 +0100)

Trivial merge