Merge branch 'MDL-39545_master' of https://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 11:37:18 +0000 (12:37 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 8 May 2013 11:37:18 +0000 (12:37 +0100)
1  2 
mod/assign/locallib.php

Simple merge