Merge branch 'MDL-27001-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2011 13:50:26 +0000 (15:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2011 13:50:26 +0000 (15:50 +0200)
commit4a94d2c61fd4402715b11852b46b90c50ba1dd28
tree7504717fa01eb3f4912b6005b3e7e5852095a64e
parentd09ca89642cea4dcaf7ad42b67d6fa3289a1e33e
parent3e4c24350090292a3316ed217756cc3731dcfd31
Merge branch 'MDL-27001-master' of git://github.com/sammarshallou/moodle
course/lib.php
lib/db/upgrade.php
lib/moodlelib.php
mod/wiki/lib.php