Merge branch 'MDL-57962-master' of git://github.com/dpalou/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Feb 2017 11:19:16 +0000 (11:19 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Feb 2017 11:19:16 +0000 (11:19 +0000)
commitf1b1c85b63cd165761fb6a8c221a65a707a56ca5
tree66cc983875043fbb25de18ab9b4ba652ccc35812
parent4163871ceaf69f4a5abf236eaa25022ad8cf6ddf
parentaa9059b965a98ddb29524bf3093fb044a0edc4db
Merge branch 'MDL-57962-master' of git://github.com/dpalou/moodle