Merge branch 'MDL-39761-master' of https://github.com/lucisgit/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 02:30:24 +0000 (14:30 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jun 2013 02:30:24 +0000 (14:30 +1200)
1  2 
mod/assign/locallib.php

Simple merge