Merge branch 'MDL-55053-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:04:23 +0000 (14:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 06:04:23 +0000 (14:04 +0800)

Trivial merge