Merge branch 'master_MDL-55820' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Sep 2016 10:32:19 +0000 (11:32 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Sep 2016 10:32:19 +0000 (11:32 +0100)
commita2184f971feead02bd976482a3a50fba0ce74053
tree7187f90050e06a29dfc8b2b2f3d712b45a29b002
parentdaa571af9f0e5b03dbeef6ed4774b6e5302d28f7
parent5d453ff40e5960e284b32f18b5341a75cb722d02
Merge branch 'master_MDL-55820' of git://github.com/danmarsden/moodle