Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 11:37:44 +0000 (12:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 11:37:44 +0000 (12:37 +0100)
commitcee44e2d96be1e23abf02350b36bfdf9a073b72d
treebcebd12707cd41ade193039e4793b3eca8bc47de
parentecb4c3f0ed8cb54a3026b957a4655df558b034e3
parent0e7f31b42bc958e57b91fe94dc47b012b2a2b0c9
Merge branch 'MDL-31363_grade_constants' of git://github.com/andyjdavis/moodle

Conflicts:
lib/grade/constants.php
lib/grade/constants.php