Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)

Trivial merge