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

Trivial merge