Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 09:46:08 +0000 (10:46 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Apr 2015 09:46:08 +0000 (10:46 +0100)
1  2 
mod/assign/locallib.php

Simple merge