Merge branch 'MDL-50412-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Sun, 18 Oct 2015 23:56:51 +0000 (07:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Sun, 18 Oct 2015 23:56:51 +0000 (07:56 +0800)

Trivial merge