Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:28:32 +0000 (09:28 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 09:28:32 +0000 (09:28 +0000)
commitc7f9bbf6c17968f68992f175e76de76712cce2ed
treeb461e4871002e7f0f4afc7292b21d8095eb6d149
parentc44913b845a235a1b48477c761ef268d56a3bab4
parent4d3fb5b8793dcbf6a6ba884d9c8d43b21887900f
Merge branch 'master_MDL-46782' of git://github.com/danmarsden/moodle