Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng...
authorPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:54:53 +0000 (14:54 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 10 Jan 2011 13:54:53 +0000 (14:54 +0100)

Trivial merge