Merge branch 'MDL-37847_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit65828d865244873d2a3e613a48cc1c4ef1d9463f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:56:03 +0000 (4 22:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Feb 2013 21:56:03 +0000 (4 22:56 +0100)
tree7b698d7708bc6a6ff21679b137a841523e60aec0
parent2c9f35960f836f5e8b1f3794301ef2b43b310d9e
parentb7f894a4031f4657927298091f5d38530004f098
Merge branch 'MDL-37847_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE