Merge branch 'w15_MDL-32365_m23_id' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 16:55:33 +0000 (18:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 16:55:33 +0000 (18:55 +0200)

Trivial merge