Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle
commit9f0218857555777830af3b3b8c34bfc020d7ade4
authorDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 11:35:36 +0000 (1 11:35 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Nov 2016 11:35:36 +0000 (1 11:35 +0000)
tree978c3fb483a093cbe977eee243db544615839ac1
parent9bf205fb737fe8ec3b348839ec17ccc9df0bf934
parent757f42cb15fe679bd369fd4ac34280515a803949
Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle