Merge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:44:54 +0000 (13:44 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 27 Dec 2010 12:44:54 +0000 (13:44 +0100)

Trivial merge