Merge branch 'MDL-57265' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 00:51:21 +0000 (08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Dec 2016 00:51:21 +0000 (08:51 +0800)

Trivial merge