Merge branch 'MDL-41595_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE
commit657beb8924267cb2202ba78bec8d49b55970a744
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:42 +0000 (17 02:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Sep 2013 00:15:42 +0000 (17 02:15 +0200)
tree6b40ab58dc12f9dc7a1bc1b33469f4f692a5b515
parent1d5c18879822cc19549a484a7b88782da316c270
parent0f85e6ba0b7352426e2a8ec2682da36423c5f105
Merge branch 'MDL-41595_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE