Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)

Trivial merge