Merge branch 'm31_MDL-46782' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE
commiteee6c61ea610ed02b52cc28f2d10e7e3a7da4bbd
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:29:37 +0000 (23 09:29 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:29:37 +0000 (23 09:29 +0000)
tree1632e9a61b56d6f99d7d76794214463ab0867456
parent26c76fcc0b1dee0d0f86ce0a74871174c20e4260
parent4af0bb82e1ad4dbab3a9b06662d1d60fb2072e43
Merge branch 'm31_MDL-46782' of git://github.com/danmarsden/moodle into MOODLE_31_STABLE