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)
commite8d14e464b10762c939c0a68df1393034b653626
tree7a6ed5d4870e7d9722954f59407197d434a59856
parent890d8dbffebf95e4f1129130516ca7aaf6cbcdd7
parentea33260cceb51571284a7dcee2b931b58bfd6ee8
Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle

Conflicts:
grade/grading/form/guide/tests/guide_test.php