Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:53:07 +0000 (12:53 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 7 Jan 2014 04:53:07 +0000 (12:53 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge