Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 18:15:09 +0000 (19:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 18:15:09 +0000 (19:15 +0100)

Trivial merge