Merge branch 'MDL-47450-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 09:25:32 +0000 (10:25 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Aug 2015 09:25:32 +0000 (10:25 +0100)

Trivial merge