Merge branch 'MDL-39929' of https://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Sep 2014 22:13:53 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Sep 2014 22:13:53 +0000 (00:13 +0200)
1  2 
mod/assign/lib.php
mod/assign/locallib.php
mod/assign/renderable.php

Simple merge
Simple merge
Simple merge