Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 23:16:04 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Jul 2014 23:16:04 +0000 (01:16 +0200)

Trivial merge