Merge branch 'MDL-53249-master' of git://github.com/merrill-oakland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 06:22:31 +0000 (14:22 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Feb 2016 06:22:31 +0000 (14:22 +0800)

Trivial merge