Merge branch 'MDL-40785_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit9655e2e335f7e489644faf7d969da1ebf68a47a1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:01:28 +0000 (23 18:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jul 2013 16:01:28 +0000 (23 18:01 +0200)
treeaf360e5e15d6cc526d6d0df14b34fcab0d0ed04a
parent4e60c378cfbbdd8784164eca962c68c365c44a82
parent0d62d8196e3f6e711e04fd313aaef268195cfaa0
Merge branch 'MDL-40785_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE