Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:41:10 +0000 (19:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:41:10 +0000 (19:41 +0200)
commit52e9827495740cd9937edb90e2754c087c7455a6
treef41932e28f39fb51866f6b26796b9e538d2324a9
parent164e90dd70726c1c342cafc20c4f6c311d377276
parentc8135e8b183a63e7e6bb6ebfbb16c6f44f76e700
Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle