Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:47:30 +0000 (12:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Jul 2014 11:47:30 +0000 (12:47 +0100)
1  2 
mod/assign/locallib.php

Simple merge