Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:32:44 +0000 (13:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 11:32:44 +0000 (13:32 +0200)
commit5522e44658372251fbf83c4f4b03a49fe77e5675
tree01bf120a35bff2a7d6aa2a11734d851e79814587
parenta5fc5b6cebbff3d07fff6b509a4243b70260a5c0
parent5fee56d5c352708fba20d7caec9f5b4c6e133217
Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle