Merge branch 'MDL-48549_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:37:35 +0000 (09:37 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 7 Jan 2015 01:37:35 +0000 (09:37 +0800)
1  2 
mod/assign/locallib.php

Simple merge