Merge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 12:29:10 +0000 (13:29 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Jun 2015 12:29:10 +0000 (13:29 +0100)

Trivial merge