Merge branch 'MDL-50254-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 12:09:42 +0000 (13:09 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 12:09:42 +0000 (13:09 +0100)

Trivial merge