Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 16 May 2012 01:09:32 +0000 (13:09 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 16 May 2012 01:09:32 +0000 (13:09 +1200)
1  2 
course/lib.php
mod/data/lib.php

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