Merge branch 'MDL-51749-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Jun 2016 16:10:05 +0000 (17:10 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 16 Jun 2016 08:04:11 +0000 (09:04 +0100)

Trivial merge