Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:03:42 +0000 (18:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Oct 2011 16:03:42 +0000 (18:03 +0200)

Trivial merge