Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 17:53:03 +0000 (18:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 17:53:03 +0000 (18:53 +0100)

Trivial merge