Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 25 Nov 2014 11:07:50 +0000 (11:07 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 25 Nov 2014 11:07:50 +0000 (11:07 +0000)
1  2 
mod/assign/locallib.php

Simple merge