Merge branch 'MDL-35364_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
commit9c65b19cb5d564c75289a23df7efc472b65274a0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2013 21:36:55 +0000 (24 23:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Apr 2013 21:36:55 +0000 (24 23:36 +0200)
treebc12d5853f0b240ed362a8082da4a83dbba9b586
parentce024436be12a7b5fc70f492ca098a86f9e2c8e1
parent79ed1fe6c64e3cf2941e9571b5612f289dea84f7
Merge branch 'MDL-35364_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE