Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
commit4856fb65b258c3b48d180fbb113e899bdbaa22e8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 17:00:03 +0000 (4 18:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 4 Mar 2013 17:00:03 +0000 (4 18:00 +0100)
treef26cb26d449a8a1f337f3af5963483372ada6e0b
parentbbdbe0a4909ef61ca599cb21a431e29617b82618
parentfad56ea4be41131f4262ea48ad2bf70b067f4185
Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE