Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2011 14:57:54 +0000 (16:57 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2011 14:57:54 +0000 (16:57 +0200)
commite62a947eec0b30222b10c8cc1b70c30bdf0b15c8
treebee308d71b9c9d91492d692d3e2f135f4659b169
parentdd8f2538b692c6167dca4be9e5de918889d0d4fc
parent47f5964381e9e33cba48aafa2e6265d68218505c
Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle