Merge branch 'MDL-56602-master-2' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 11:26:14 +0000 (11:26 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 11:26:14 +0000 (11:26 +0000)
commitf670b39e69002480867cc13a81f0c6ca6e1249d3
treea3b723c71fdf417a704c8799779ad56f345ab683
parent1e17258b6695344ef8bf63d059a1dd80d71eea5f
parent9d75a519f38fa2d0f1988be40fe18978ba4d35e7
Merge branch 'MDL-56602-master-2' of git://github.com/andrewnicols/moodle