Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge