Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:03:40 +0000 (08:03 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 Sep 2014 07:03:40 +0000 (08:03 +0100)
1  2 
mod/assign/locallib.php

Simple merge