Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Feb 2011 00:53:47 +0000 (01:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Feb 2011 00:53:47 +0000 (01:53 +0100)

Trivial merge