Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:41:15 +0000 (21:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 10 May 2016 13:41:15 +0000 (21:41 +0800)
1  2 
mod/assign/locallib.php

Simple merge