Merge branch 'MDL-38311_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commitef01018a00942c0b25e3aa22c79de7069a18e272
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 00:24:11 +0000 (6 01:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Mar 2013 00:24:11 +0000 (6 01:24 +0100)
treeaa85e64737c660c9a129cf7e95e469780a7fa709
parentbc144ebbe0a78a1ac854454246f26472ba0748b7
parent1707b741b6682008c93e5f2993fdb1b24d3e7d80
Merge branch 'MDL-38311_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE