Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2016 09:33:09 +0000 (10:33 +0100)
commite7b9ea226c295fd728878655a1edb68c5bd22f2d
tree940127cbe7dbfb9c13d6aac682ec7a705addb321
parent1bf9d6ac923028d72bb11054e5903fac709f0f85
parentdc48cc0a7983c3413d58c1afbcf04ab03eccf75c
Merge branch 'MDL-56911-master' of git://github.com/ankitagarwal/moodle