Merge branch 'MDL-54072' of git://github.com/aolley/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:14:27 +0000 (15:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 May 2016 07:14:27 +0000 (15:14 +0800)

Trivial merge