Merge branch 's11_MDL-27999_wiki_preview_master' of github.com:dongsheng/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:13:48 +0000 (00:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Jun 2011 22:13:48 +0000 (00:13 +0200)

Trivial merge