Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 21:03:02 +0000 (22:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 14 Jan 2014 21:03:02 +0000 (22:03 +0100)
commit988c6ba1b8bb969e8d6915ad240f227832ac5461
tree8dc480ab5caa0fc49c23588c6fb8d15d00558f75
parent372a6122210969a89137aa2a0811635d92b5b3f4
parent4e2ba4bb31add3af6585f2f7dd687b86cbd3c30c
Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle

Conflicts:
grade/tests/behat/behat_grade.php
grade/tests/behat/grade_view.feature