Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 05:58:22 +0000 (13:58 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 20 Aug 2014 05:58:22 +0000 (13:58 +0800)
Conflicts:
course/modlib.php


Trivial merge