Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle
authorDan Poltawski <dan@moodle.com>
Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)
committerDan Poltawski <dan@moodle.com>
Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)
1  2 
lang/en/grades.php

Simple merge