Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 14:03:10 +0000 (14:03 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:29 +0000 (09:07 +0000)
commit4678592332e5996542822b94b3a39716c888f53e
treed9a1b4e7dd4c9b45cb606180dd0738136e51d114
parent6dad38deed08f6461f7bd38ba694c386d6a2fc67
parentf34df17977bebc70dd1b543938aca132ca2701a6
Merge branch 'MDL-56426_master' of git://github.com/markn86/moodle