Merge branch 'w02_MDL-37019_m25_metadef' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:58:08 +0000 (01:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Jan 2013 00:58:08 +0000 (01:58 +0100)

Trivial merge