Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 12:19:19 +0000 (13:19 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 12:19:19 +0000 (13:19 +0100)
commit93c253d30313cbe21c1d4dc328008ec54451bd30
treed542133f2c02a70fb2985b05d570294eac9c1d7b
parentbe7c4e4cac89f41fa45075882d7042b7e73232c7
parent428f7864a1ceab1439e3e09f76742bafd53f3167
Merge branch 'MDL-58794-master' of git://github.com/junpataleta/moodle