Merge branch 'w32_MDL-34601_m24_wikischema' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2012 19:15:46 +0000 (21:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Aug 2012 19:15:46 +0000 (21:15 +0200)
commit8b77ab0c1039d56d975f366dfcbeececebaf125b
tree41cf87f81bec4bc1c91b6aaedf4ef4a6d09fb972
parentfb87c4c96c59d4eb37946bd8d30b3da8e226a7af
parent405a11e88ddcd49408af7501d06666347e9dfbdb
Merge branch 'w32_MDL-34601_m24_wikischema' of git://github.com/skodak/moodle