Merge branch 'MDL-39957_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 Aug 2013 04:38:08 +0000 (12:38 +0800)
1  2 
course/lib.php
lang/en/moodle.php
lib/moodlelib.php

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