Merge branch 'MDL_55423_master' of https://github.com/alexandru-elisei/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 08:26:28 +0000 (09:26 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 08:26:28 +0000 (09:26 +0100)

Trivial merge