Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 27 Jul 2014 20:46:03 +0000 (08:46 +1200)
committerSam Hemelryk <sam@moodle.com>
Sun, 27 Jul 2014 20:46:03 +0000 (08:46 +1200)
1  2 
mod/assign/locallib.php

Simple merge