Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:50:37 +0000 (13:50 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:50:37 +0000 (13:50 +0100)
commit307e63cb00ff3b0a06dd8461c0f36c654b8ec2f3
tree29ccb9ca8e1e13be7fb0ac90a28a8c331b85a31a
parenta5cb07477c7632f2f9302e089561b6a9f1332f40
parentfca211bf051af36262edab1531df45543dcccdc0
Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle