Merge branch 'MDL-57287-master' of git://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:19:22 +0000 (12:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 12:19:22 +0000 (12:19 +0000)

Trivial merge