Merge branch 'MDL-57588_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE
commit21f77735fc1da94bd41696b2509af665c03ab93a
authorDan Poltawski <dan@moodle.com>
Tue, 31 Jan 2017 11:39:16 +0000 (31 11:39 +0000)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 1 Feb 2017 05:07:46 +0000 (1 13:07 +0800)
tree966975326b01a50d1cf47e856215802924960797
parent6df1f24a6b11e2fa18685827cbe468cdc2ff9ce6
parent9e50e8c38661f77eb16e4e3f6b6f1f5f46fd7fdf
Merge branch 'MDL-57588_31' of git://github.com/timhunt/moodle into MOODLE_31_STABLE