Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:59:35 +0000 (09:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 21 Jan 2013 01:59:35 +0000 (09:59 +0800)
1  2 
course/lib.php

diff --cc course/lib.php
Simple merge