Merge branch 'MDL-48235-master-fixes' of git://github.com/xow/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 18 Dec 2014 04:35:55 +0000 (12:35 +0800)
committerDavid Monllao <davidm@moodle.com>
Thu, 18 Dec 2014 04:35:55 +0000 (12:35 +0800)
1  2 
mod/assign/locallib.php

Simple merge