Merge branch 'MDL-34985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_2...
commite7920065ac8a3d23657646b8e93ca9781acd527a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:08:05 +0000 (6 20:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Sep 2012 18:08:05 +0000 (6 20:08 +0200)
tree2f9eeffa233442483ffc6779e978f21ca7bda33f
parent222abcddd4c9e346241b5dfa6fd706a942653ea5
parentcae60d13ab2cbc705018489f417f0e494bdc4270
Merge branch 'MDL-34985_m22' of git://github.com/merrill-oakland/moodle into MOODLE_22_STABLE