Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Dec 2013 15:24:26 +0000 (16:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Dec 2013 15:24:26 +0000 (16:24 +0100)
commitd073a5f11873746cd849401b486ad54198e83741
treef59bf1c2ab4acd1be21da51183a9f40228fb0285
parent95971ae99ea950adc7e49b2a4e06513e5d53742d
parent262075ce028493c42639a01340ef2f9bbba30148
Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle