Merge branch 'w41_MDL-42199_m26_rev' of https://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Oct 2013 08:53:03 +0000 (10:53 +0200)

Trivial merge