Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:29:22 +0000 (11:29 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 03:29:22 +0000 (11:29 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge