Merge branch 'MDL-55742-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Sep 2016 09:50:47 +0000 (10:50 +0100)
commitdca4a8710111c9efb87341dcd161afebf9ff9879
tree80ffc63757c1c0add70ab65936516d03da9968aa
parent9dd516c432898d5cf0de94ceaa4ba9a2ba3d506e
parent3b4491e8aa0ec8ad1ba181b7ced221d0fe4e2b70
Merge branch 'MDL-55742-master' of https://github.com/xow/moodle