Merge branch 'MDL-28221-resource-conversion_21_STABLE' of git://github.com/mudrd8mz...
commitfe97a3dc7acb328d0dc7cafa62b39159b966117a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2011 17:05:04 +0000 (12 19:05 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2011 17:05:04 +0000 (12 19:05 +0200)
treeba2c85ddfb278eb25e69e58350f9e7c6f6eb7dcf
parent6f09ed8643704189e670e6ee29a087971b2d4da8
parent665120d4e644079570c5e283f58e9165409f5a31
Merge branch 'MDL-28221-resource-conversion_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE