Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 00:53:02 +0000 (08:53 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 23 Jan 2013 00:53:02 +0000 (08:53 +0800)
1  2 
course/lib.php
course/rest.php
mod/assign/upgradelib.php

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