Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 06:40:42 +0000 (14:40 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 20 Aug 2013 06:40:42 +0000 (14:40 +0800)
commit5a10d2a7ae0d87b4517fd994ddb2519e28a52f01
tree7d76fdbf4f5d1f439dda2764fc2444a697910dc9
parent740c4ada36bf0b017b5089091402441963409747
parent71298fea033dd9c3425c317d59a36b080cc29b0a
Merge branch 'wip-mdl-40043' of git://github.com/rajeshtaneja/moodle

Conflicts:
course/tests/courselib_test.php
lang/en/moodle.php
course/tests/courselib_test.php
lang/en/moodle.php