Merge branch 'MDL-52105-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:13:27 +0000 (11:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 Aug 2016 10:13:27 +0000 (11:13 +0100)

Trivial merge