Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:41:16 +0000 (12:41 +0100)
commit0db846acdad3b244e106907a068fcf66fda1a0ae
tree473360b83b525b38abec7f93ac90b2c6044c036e
parentd2a201c83b966276bfbec09ad16796d59f9a7b95
parentd07f2def920bcf699a24280fa6133c0c2ca86a48
Merge branch 'w07_MDL-25998_20_enrolrole' of git://github.com/skodak/moodle