Merge branch 'MDL-49926-master' of git://github.com/mastnym/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2015 02:25:25 +0000 (10:25 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Apr 2015 09:11:16 +0000 (10:11 +0100)

Trivial merge