Merge branch 'w24_MDL-33636_m23_yuislash' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:31:27 +0000 (12:31 +0200)

Trivial merge