Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:58:54 +0000 (14:58 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:58:54 +0000 (14:58 +0800)
1  2 
mod/assign/locallib.php

Simple merge