Merge branch 'MDL-49988_fix_wiki_preview' of https://github.com/DMaterka/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 22:30:08 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 May 2017 22:30:08 +0000 (00:30 +0200)

Trivial merge