Merge branch 'MDL-36881-m' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:52:01 +0000 (08:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 28 Jan 2013 19:52:01 +0000 (08:52 +1300)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge