Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:21:58 +0000 (17:21 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 19 Oct 2015 09:21:58 +0000 (17:21 +0800)
1  2 
mod/assign/gradingtable.php
mod/assign/locallib.php

Simple merge
Simple merge