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

Trivial merge