Merge branch 'MDL-26392_wiki_images' of git://github.com/dongsheng/moodle
authorPetr Skoda <commits@skodak.org>
Mon, 7 Mar 2011 11:40:04 +0000 (12:40 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 7 Mar 2011 11:40:04 +0000 (12:40 +0100)
commit8eade3d773c58dc62f7a549709be56ffd006c06f
tree2d261252bfc03ae2927f63259ac0a9bf46805bba
parent25ca24d59fb4a554b5299dc4e8939d277ddf4668
parent0c5e812ba7c43856b5193f03b75a3f7a3d51d686
Merge branch 'MDL-26392_wiki_images' of git://github.com/dongsheng/moodle