Merge branch 'MDL-55246_unoconv' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 09:11:13 +0000 (10:11 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Aug 2016 09:11:13 +0000 (10:11 +0100)

Trivial merge