Merge branch 'MDL-51964-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Nov 2015 02:52:37 +0000 (10:52 +0800)

Trivial merge