Merge branch 'MDL-53945' of git://github.com/aolley/moodle
commit808005ddf9ca8afaad2a90f597dacd7f0a38abdb
authorDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:07:26 +0000 (4 14:07 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:07:26 +0000 (4 14:07 +0000)
treeff89c06cc563906d9fcd75db225f68c8d7dba96c
parent7eb34671c13b07ae62c8391ade4777361f4384b7
parent4bd8e65273838b21dd67d068dcc2364c1756595c
Merge branch 'MDL-53945' of git://github.com/aolley/moodle