Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 11:34:49 +0000 (21:34 +1000)
committerMarina Glancy <marina@moodle.com>
Tue, 9 Jul 2013 11:34:49 +0000 (21:34 +1000)
1  2 
mod/assign/gradingtable.php
mod/assign/locallib.php

Simple merge
Simple merge