Merge branch 'wip_MDL-49327_2.8_guide_getinstance' of https://github.com/nixorv/moodle into MOODLE_28_STABLE

Conflicts:
	grade/grading/form/guide/tests/guide_test.php
This commit is contained in:
Dan Poltawski
2015-03-24 09:31:13 +00:00
@@ -18,7 +18,7 @@
* Unit tests for Marking Guide grading method.
*
* @package gradingform_guide
* @category phpunit
* @category test
* @copyright 2015 Nikita Kalinin <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/grade/grading/form/guide/lib.php');
* Test cases for the Marking Guide.
*
* @package gradingform_guide
* @category phpunit
* @category test
* @copyright 2015 Nikita Kalinin <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/