Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)
Conflicts:
grade/grading/form/guide/tests/guide_test.php


Trivial merge