Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 15:53:18 +0000 (16:53 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 15:53:18 +0000 (16:53 +0100)
1  2 
mod/assign/locallib.php

Simple merge