Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:00:20 +0000 (00:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:00:20 +0000 (00:00 +0200)
1  2 
lib/enrollib.php
lib/setup.php

Simple merge
diff --cc lib/setup.php
Simple merge