Merge branch 'MDL-57198' of git://github.com/phager-at/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:46:39 +0000 (12:46 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 12:46:39 +0000 (12:46 +0000)

Trivial merge