Merge branch 'MOODLE_31_STABLE' of https://github.com/fwsl/moodle into MOODLE_31_STABLE
commitf569989db30809e624009b2641447c686df48642
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 11:07:30 +0000 (28 12:07 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 11:07:30 +0000 (28 12:07 +0100)
tree8ec246382bc299a5dcf22d90c78814326cb10a7d
parentaf84c619a09de5705f186390db32f615697d1f51
parent52f391ceab36b0a0728693167c88a9172485aad6
Merge branch 'MOODLE_31_STABLE' of https://github.com/fwsl/moodle into MOODLE_31_STABLE