Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 20:39:26 +0000 (22:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Apr 2016 20:39:26 +0000 (22:39 +0200)
commitaca13ea2b6b64f024ca5f7122f755318c01e97c6
tree021fa5611276fabd8eefd2457a2a38de0667ca26
parent11c673f3a3408dfede77a8639502194b6d929f12
parent501801a2f84f69bfae86294248684c12b27c22c0
Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle