Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 08:30:33 +0000 (09:30 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 08:30:33 +0000 (09:30 +0100)
commita5cb07477c7632f2f9302e089561b6a9f1332f40
tree0b3ed925864329249312448062c4f1ffc972c885
parent1a1771b944384f6a580ef6c9e7abc2a4e540448c
parent9698ca2d20ac256d9fba86d5e991ca22638c9c1c
Merge branch 'MDL-55352-master' of git://github.com/lameze/moodle