Merge branch 'MDL-58255-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:08:54 +0000 (13:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Mar 2017 13:08:54 +0000 (13:08 +0000)
1  2 
mod/assign/lib.php
mod/assign/locallib.php

Simple merge
Simple merge