Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 24 Apr 2015 03:38:07 +0000 (11:38 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 24 Apr 2015 09:19:20 +0000 (10:19 +0100)

Trivial merge