Merge branch 'w50_MDL-36245_m25_convert' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 22:41:48 +0000 (23:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Dec 2012 22:41:48 +0000 (23:41 +0100)

Trivial merge