Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 03:57:09 +0000 (11:57 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Jan 2014 03:57:09 +0000 (11:57 +0800)
1  2 
mod/assign/locallib.php

Simple merge