Merge branch 'MDL-55951-30' of git://github.com/crazyserver/moodle into MOODLE_30_STABLE
commite1043b0311e7b34ef228ad6d66b65d12389e8d42
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Sep 2016 22:11:43 +0000 (28 00:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Sep 2016 22:11:43 +0000 (28 00:11 +0200)
treec8e438b16b752690208878de777493d0e1805ff9
parentcd9cf364a1a6c947206c62d0449b9778c85e71f9
parent078d007b87794e29d6c5afac4923d1e6d95524cc
Merge branch 'MDL-55951-30' of git://github.com/crazyserver/moodle into MOODLE_30_STABLE