Merge branch 'MDL-41446-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_...
commit45c03504ad5b5556a7e4027aaf028815f106f702
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:56:02 +0000 (3 23:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Dec 2013 22:56:02 +0000 (3 23:56 +0100)
treec74e7c66d105f84e40db911b1646fdead82978ce
parente7698992b76fd912276e5746cb06597b66b815f7
parent2d124e8f4ea2440d82a9fd2b80225f1b9246d3bf
Merge branch 'MDL-41446-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE