Merge branch 'mdl44669-master' of https://github.com/tlock/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 9 Apr 2014 05:05:46 +0000 (13:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 9 Apr 2014 05:05:46 +0000 (13:05 +0800)
1  2 
mod/assign/module.js

Simple merge