Merge branch 'MOODLE_31_STABLE' of https://github.com/fwsl/moodle into MOODLE_31_STABLE
commite1fbc8e4da321c1e64889c65ac3163bdf6b538ce
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:01:05 +0000 (13 12:01 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:01:05 +0000 (13 12:01 +0100)
treecb4691b544741d743b5c095341c630e133770348
parentb3d43b015d5e1295a48416813e2f1ee2594f9f68
parent5400ad13dd3c292999a8dc574acf746e79d36c5e
Merge branch 'MOODLE_31_STABLE' of https://github.com/fwsl/moodle into MOODLE_31_STABLE