Merge branch 'w44_MDL-29897_m22_upgradetxt' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 15:35:57 +0000 (16:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 9 Nov 2011 15:35:57 +0000 (16:35 +0100)

Trivial merge