Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 23:31:46 +0000 (11:31 +1200)
committerSam Hemelryk <sam@moodle.com>
Wed, 13 Jun 2012 23:31:46 +0000 (11:31 +1200)
1  2 
mod/assign/gradingtable.php
mod/assign/locallib.php

Simple merge
Simple merge