Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Jun 2016 03:09:47 +0000 (11:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Jun 2016 03:09:47 +0000 (11:09 +0800)

Trivial merge