Merge branch 'MDL-49723-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Apr 2015 15:25:47 +0000 (16:25 +0100)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Apr 2015 07:32:16 +0000 (15:32 +0800)

Trivial merge