Merge branch 'MDL-51311-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 03:32:55 +0000 (11:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Sep 2015 03:32:55 +0000 (11:32 +0800)

Trivial merge