Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:53:53 +0000 (11:53 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Nov 2014 11:53:53 +0000 (11:53 +0000)
1  2 
mod/assign/locallib.php

Simple merge