Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:48:27 +0000 (15:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Dec 2016 15:48:27 +0000 (15:48 +0000)
commite1ac1788927c1b7ae5dcb70e9fd918bff78a6663
treecfe431eb053cc9e5ba244f16ffc78393cfc548c0
parentd68562bdb97d6977506fccb0cc7c2f5823e2b4e4
parent0eda810d17f70e8278a391e0644de1f7efbbbf01
Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle