Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 17:13:56 +0000 (19:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Apr 2015 17:13:56 +0000 (19:13 +0200)
1  2 
mod/assign/gradingtable.php
mod/assign/mod_form.php

Simple merge
Simple merge