Merge branch 'MDL-54567-master-build' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 06:39:23 +0000 (14:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 30 May 2016 06:39:23 +0000 (14:39 +0800)

Trivial merge