Merge branch 'MDL-37654_master' of https://github.com/markn86/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 05:09:18 +0000 (13:09 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Feb 2013 05:09:18 +0000 (13:09 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge