Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 05:49:23 +0000 (13:49 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Feb 2013 05:49:23 +0000 (13:49 +0800)
1  2 
mod/assign/locallib.php

Simple merge