Merge branch 'w33_MDL-29027_m22_textlib' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 16:49:05 +0000 (18:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Aug 2011 16:49:05 +0000 (18:49 +0200)

Trivial merge