Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Nov 2015 22:52:45 +0000 (23:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 30 Nov 2015 22:52:45 +0000 (23:52 +0100)
1  2 
mod/assign/locallib.php

Simple merge