Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 14:56:55 +0000 (15:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 22 Jul 2014 14:56:55 +0000 (15:56 +0100)
1  2 
mod/assign/locallib.php

Simple merge