Merge branch 'wip-MDL-22819-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Aug 2015 02:22:04 +0000 (10:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 3 Aug 2015 02:22:04 +0000 (10:22 +0800)

Trivial merge