Merge branch 'MDL-49176_marking_guide' of git://github.com/davosmith/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jul 2015 03:25:42 +0000 (11:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jul 2015 03:25:42 +0000 (11:25 +0800)
commit8aa8a7465b75da61993e571ceb3a86bca053b4e4
treea14881a26c99fd800b065f2443fade99d97fefb8
parentfd05c11399575012c20b1defe5a6aee6e0bc08e7
parent556e33d77c87d44032d15a33be663e7dd01d03c0
Merge branch 'MDL-49176_marking_guide' of git://github.com/davosmith/moodle