Merge branch 'MDL-49906-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 13:04:10 +0000 (14:04 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 May 2015 13:04:10 +0000 (14:04 +0100)

Trivial merge