Merge branch 'MDL-51588-master' of git://github.com/FMCorz/moodle
commitc1604af966c63efb27ec614b36fa5bf1dc7c8687
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:41:01 +0000 (6 11:41 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:36 +0000 (6 16:31 +0100)
tree1d6446c9056e402ec3314b78cd08c9bda11cf80d
parent4d49a32f9e3ef2118c9912a8207f901f50a5b622
parent3665f8036c1251b3d5d13598fad169f4dcfe8da9
Merge branch 'MDL-51588-master' of git://github.com/FMCorz/moodle