Merge branch 'MDL-58035' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 7 Mar 2017 17:49:42 +0000 (14:49 -0300)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:03:52 +0000 (18:03 +0000)

Trivial merge