Merge branch 'MDL-49383-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 11:05:45 +0000 (12:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 27 Jul 2015 11:05:45 +0000 (12:05 +0100)

Trivial merge