projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 372a612 4e2ba4b)
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)
Conflicts:
grade/tests/behat/behat_grade.php
grade/tests/behat/grade_view.feature


Trivial merge
Moodle official production repository