Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:38:18 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 18:38:18 +0000 (20:38 +0200)
commitd4ca1215bb724f35f758f82e9eb112843ea2e067
treeeef0678cb4749dd1327df676fd4c3326897b361e
parentf8ca380b474dd7bea66b8a010e939affbe058a0c
parent7025aeed030fb011060068a1d6d3fb12e2e77a3b
Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle