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)
1  2 
course/lib.php
lib/db/upgrade.php
lib/moodlelib.php
mod/wiki/lib.php

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