Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 04:48:08 +0000 (12:48 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 2 Apr 2013 04:48:08 +0000 (12:48 +0800)
commit9ab0aece4983254738ca925ddaf2fccc0b7d755c
tree8fde963a5736f2143a0eff6d2c1e14bbbc5bc541
parent08e5aed273ba920d1dae28dc5339a5da66f04e50
parentbb1592c860a027c7d7aaa4de7d7da5a8261802ec
Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/tests/courselib_test.php
course/lib.php
course/tests/courselib_test.php