Merge branch 'MDL-54772-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:35:58 +0000 (09:35 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jun 2016 08:35:58 +0000 (09:35 +0100)

Trivial merge