Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 10:42:23 +0000 (11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 10:42:23 +0000 (11:42 +0100)
commit64fe8bfe946c61cbc783dfb0967dc4cbc7350bf3
treedf994c03943bcd871b29437eb42a0a6fd06d78d0
parent31245d874669fca984f035fbc2cb521c2fc289e3
parentf0242b4d9548e52e1843e3015942b1d4b37f3981
Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle