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)
commit516b956a28f81a0fd0ca1b8f1dfdd537a6e3bc29
tree2027d0c2426a7b7521d98a00c9271d2901d70012
parent92f901158f1c6c21b1bad809a15826644182482a
parentcb3ef22065e185227b38a00072fc782879fb0dca
Merge branch 'MDL-29256-resource-format' of git://github.com/mudrd8mz/moodle