Merge branch 'MDL-30408-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:43:19 +0000 (01:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2012 00:43:19 +0000 (01:43 +0100)
1  2 
course/lib.php
lib/adminlib.php
lib/moodlelib.php

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