Merge branch 'MDL-57841-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 19:18:17 +0000 (20:18 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Feb 2017 19:18:17 +0000 (20:18 +0100)
commitf20f598ab5fbc294975d453e49f4b338f7eaaf48
treedb7bd73d9ea8142e24056ec10e7f78e6177f9d14
parent8abe17288b0a908bb3e1a0adfd79404bb44bfe4b
parent13fb78a4f64fc9cf2ee7a7cd94eb14f2ff47f660
Merge branch 'MDL-57841-master' of git://github.com/damyon/moodle