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)
commit7761a38737c8844f65c0115c944356df16e5062e
tree9d0ccb85dd12240ffaf08a1ac59a504a515c99fb
parentf2bf31e8868274f8c1204e3a1df64798b5ae5087
parentab633dafac4ab3545d81c6dfc6e6017fe6cd3b9f
Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle