Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 Dec 2016 12:20:01 +0000 (12:20 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Dec 2016 12:20:01 +0000 (12:20 +0000)
commita8bac976131770864ace8bde3cc0c9a2c566847f
tree94ca2899e651e84fc818389bbb6a4ff18975a8ae
parent2b114798b91a59836e45696a9ac0760db59f367d
parent7d17256a7538854676529867436c186cb0da4c83
Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle