Merge branch 'MDL-55856-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2016 22:51:36 +0000 (00:51 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2016 22:51:36 +0000 (00:51 +0200)
commit55a1e66cfcb158736c84799c0ea8a170f26293a9
tree3681796f01b0c6617095366c49ff89687892417e
parent8292fa81844355be0980f90965785c6f1ced1a02
parentd2c7175a344f2bdaaa9dde0187d5a5247ca62d4d
Merge branch 'MDL-55856-master' of git://github.com/danpoltawski/moodle