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)
commit7c32b87bfd97367106e6bded2d4a65c1afc1cf86
tree5a7795eb83cbebe3029f2998fb576f4aea703872
parentf01330f6ca6847bb022f7d998c5d699d0909182f
parent78618bc6772e9b53ba6918db69328b063ff94d7a
Merge branch 'MDL-45029-master' of git://github.com/lameze/moodle

Conflicts:
course/modlib.php