Merge branch 'MDL-56525' of https://github.com/ak4t0sh/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 14:08:34 +0000 (14:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Dec 2016 14:08:34 +0000 (14:08 +0000)

Trivial merge