Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'MDL-36587-master' of git://github.com/damyon/moodle
Conflicts: mod/assign/locallib.php
- Loading branch information