Merge branch 'w04_MDL-37718_m25_rs' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:33:08 +0000 (01:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Jan 2013 00:33:08 +0000 (01:33 +0100)

Trivial merge