Merge branch 'MDL-29256-resource-format_21_STABLE' of git://github.com/mudrd8mz/moodl...
commit82f4e1f838bb4cc681e1a6dec5ff97a5e25dfc17
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 17:55:05 +0000 (27 18:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Feb 2012 17:55:05 +0000 (27 18:55 +0100)
tree0db87c048d34a01d315dccd639a2b3a147d3c440
parent8e53b911e7bba0a98c2e50dbc2e6fe98c9652cf2
parenta158c5c3253494b9c216dbec1f0e5e734b790f05
Merge branch 'MDL-29256-resource-format_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE