Merge branch 'MDL-47793-m' of https://github.com/micaherne/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:25:22 +0000 (14:25 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 06:25:22 +0000 (14:25 +0800)
1  2 
mod/assign/locallib.php

Simple merge