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)

Trivial merge